merge release 3.1.3

sandialabs · Mar 2, 2023 · bbb274c · bbb274c
2 parents 76a042c + 40a44f1
commit bbb274c
Show file tree

Hide file tree

Showing 859 changed files with 14,440 additions and 6,096 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.swp
 *.out
 *.pyc
+*.ipynb_checkpoints/
 
 ## Doxygen specific
 *latex/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,7 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.1)
+set (CMAKE_CXX_STANDARD 14)
 project (UQTk)
 
-if(CMAKE_VERSION VERSION_GREATER 3.14)
-cmake_policy(SET CMP0086 OLD)
-endif()
-
-if(CMAKE_VERSION VERSION_GREATER 3.13)
-cmake_policy(SET CMP0078 OLD)
-endif()
-
-
 # set( CMAKE_VERBOSE_MAKEFILE on ) # see all output
 
 

diff --git a/PyUQTk/CMakeLists.txt b/PyUQTk/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory (plotting)
 add_subdirectory (sens)
 add_subdirectory (multirun)
 add_subdirectory (utils)
+
 if ("${PyUQTk}" STREQUAL "ON")
   add_subdirectory (PyPCE)
 endif()

diff --git a/PyUQTk/PyPCE/__init__.py b/PyUQTk/PyPCE/__init__.py
@@ -1,11 +1,11 @@
 #=====================================================================================
 #
-#                      The UQ Toolkit (UQTk) version 3.1.2
-#                          Copyright (2022) NTESS
+#                      The UQ Toolkit (UQTk) version 3.1.3
+#                          Copyright (2023) NTESS
 #                        https://www.sandia.gov/UQToolkit/
 #                        https://github.com/sandialabs/UQTk
 #
-#     Copyright 2022 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
+#     Copyright 2023 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
 #     Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government
 #     retains certain rights in this software.
 #

diff --git a/PyUQTk/PyPCE/adaptation_tools.py b/PyUQTk/PyPCE/adaptation_tools.py
@@ -1,11 +1,11 @@
 #=====================================================================================
 #
-#                      The UQ Toolkit (UQTk) version 3.1.2
-#                          Copyright (2022) NTESS
+#                      The UQ Toolkit (UQTk) version 3.1.3
+#                          Copyright (2023) NTESS
 #                        https://www.sandia.gov/UQToolkit/
 #                        https://github.com/sandialabs/UQTk
 #
-#     Copyright 2022 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
+#     Copyright 2023 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
 #     Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government
 #     retains certain rights in this software.
 #