Merge branch 'develop' of https://github.com/searhein/Trilinos into p…

…artition-of-unity

* 'develop' of https://github.com/searhein/Trilinos: (100 commits)
  Change initializer list order to make g++ happy
  Plumbing for BelosBlockCGSolMgr so that Assert Positive Definiteness flag gets passed to BelosCGIter
  Change Spack module from SuperLUDist 6.2.0 to 5.4.0 (CDOFA-66)
  Testing: Tpetra: make nightly build faster
  Update CrsMatrix_UnitTests4.cpp
  Tpetra: Fixes so that trilinos#6076 can pass
  MueLu: rebasing the gold files for phase 3 refactored outputs
  MueLu: refactor of Phase3 aggregation, see issue trilinos#5838
  KokkosKernels - trsm transpose does not solve the problem correctly.
  Belos: treats cases where numResTests is zero
  Belos: removes a int cast warning and removes one unnecessary StatusTestCombo cast
  Belos: removes a int cast warning and removes one unnecessary StatusTestCombo cast
  Reduced from ctest -j8 to -j4 for all CUDA builds (trilinos#6052)
  Belos: solves Issue trilinos#6059
  Belos: solves Issue trilinos#6059
  ML: Code cleanup to RefMaxwell
  ML: Removing supperfluous import constructor
  ML: Adding new support routine
  Xpetra: disable Map cloner test if no Tpetra deprecated
  Phalanx - wrong number of kokkos allocation arguments.
  ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,77 +1,63 @@
-<!---
-Be sure to select `develop` as the `base` branch against which to create this
-pull request.  Only pull requests against `develop` will undergo Trilinos'
-automated testing.  Pull requests against `master` will be ignored.
-
-Provide a general summary of your changes in the Title above.  If this pull
-request pertains to a particular package in Trilinos, it's worthwhile to start
-the title with "PackageName:  ".
-
-Note that anything between these delimiters is a comment that will not appear
-in the pull request description once created. Most areas in this message are
-commented out and can be easily added by removing the comment delimiters.
-
-Please make sure to mark:
-* Reviewers
-* Assignees
-* Labels
-
-Replace <teamName> below with the appropriate Trilinos package/team name.
--->
-@trilinos/<teamName>
-
-## Description
-<!--- Please describe your changes in detail. -->
-
-## Motivation and Context
-<!--- Why is this change required?  What problem does it solve? -->
-
-<!---
-If applicable, let us know how this merge request is related to any other open
-issues or pull requests:
-
-## Related Issues
-
-* Closes 
-* Blocks 
-* Is blocked by 
-* Follows 
-* Precedes 
-* Related to 
-* Part of 
-* Composed of 
--->
-
-## How Has This Been Tested?
-<!---
-Please describe in detail how you tested your changes.  Include details of your
-testing environment and the tests you ran to see how your change affects other
-areas of the code.  Consider including configure, build, and test log files.
--->
-
-<!--- 
-## Screenshots
-Not obligatory, but is there anything pertinent that we should see?
- -->
-
-<!---
-Go over all the following points, and put an `x` in all the boxes that apply.
-If you are unsure about any of these, please ask&mdash;we are here to help.
--->
-
-## Checklist
-
-- [ ] My commit messages mention the appropriate GitHub issue numbers.
-- [ ] My code follows the code style of the affected package(s).
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
-- [ ] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
-- [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
-- [ ] No new compiler warnings were introduced.
-- [ ] These changes break backwards compatibility.
-
-<!--- 
-## Additional Information
-Anything else we need to know in evaluating this merge request?
- -->
+<!---
+Be sure to select `develop` as the `base` branch against which to create this
+pull request.  Only pull requests against `develop` will undergo Trilinos'
+automated testing.  Pull requests against `master` will be ignored.
+
+Provide a general summary of your changes in the Title above.  If this pull
+request pertains to a particular package in Trilinos, it's worthwhile to start
+the title with "PackageName:  ".
+
+Note that anything between these delimiters is a comment that will not appear
+in the pull request description once created. Most areas in this message are
+commented out and can be easily added by removing the comment delimiters.
+
+Please make sure to mark:
+* Reviewers
+* Assignees
+* Labels
+
+Replace <teamName> below with the appropriate Trilinos package/team name.
+-->
+@trilinos/<teamName>
+
+## Motivation
+<!--- 
+Why is this change required?  What problem does it solve? Please link to a github 
+issue that describes the problem/issue/bug this PR solves.
+-->
+
+<!---
+If applicable, let us know how this merge request is related to any other open
+issues or pull requests:
+
+## Related Issues
+
+* Closes 
+* Blocks 
+* Is blocked by 
+* Follows 
+* Precedes 
+* Related to 
+* Part of 
+* Composed of 
+-->
+
+
+## Stakeholder Feedback
+<!--- 
+If a github issue includes feedback from the relevant stakeholder(s), please link it.  
+If the stakeholder(s) communicated that feedback through a different medium, please note that you did so.
+-->
+
+## Testing
+<!---
+Please confirm that any classes or functions in the Trilinos library that this PR touches are 
+exercised by at least one test in Trilinos.  Please specify which test that is.  For untestable 
+changes (e.g. changes to the nightly testing system) or changes to Trilinos tests, please say "N/A".
+
+-->
+
+<!--- 
+## Additional Information
+Anything else we need to know in evaluating this merge request?
+ -->

cmake/ctest/drivers/rocketman/ctest_linux_nightly_mpi_release_muelu_rocketman.cmake

@@ -77,7 +77,7 @@ SET(CTEST_DO_MEMORY_TESTING FALSE)
 SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 # If true, this option yields faster builds. In that case, however, it won't disable any upstream package that fails to compile.
-SET(Trilinos_CTEST_DO_ALL_AT_ONCE FALSE)
+SET(Trilinos_CTEST_DO_ALL_AT_ONCE TRUE)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON"

cmake/ctest/drivers/rocketman/mpi_release_tpetra_deprecated_code_off_downstream_enabled.cmake

@@ -79,7 +79,7 @@ SET(Trilinos_EXCLUDE_PACKAGES Epetra GlobiPack OptiPack Domi PyTrilinos Moertel)
 SET(Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES ON)
 
 # If true, this option yields faster builds. In that case, however, it won't disable any upstream package that fails to compile.
-SET(Trilinos_CTEST_DO_ALL_AT_ONCE FALSE)
+SET(Trilinos_CTEST_DO_ALL_AT_ONCE TRUE)
 
 # Because Trilinos_CTEST_DO_ALL_AT_ONCE is set to OFF above,
 # the packages in Trilinos_EXCLUDE_PACKAGES above must also be disabled explicitly in EXTRA_CONFIGURE_OPTIONS

cmake/ctest/drivers/rocketman/mpi_release_tpetra_deprecated_code_off_downstream_enabled_GO_int.cmake

@@ -79,7 +79,7 @@ SET(Trilinos_EXCLUDE_PACKAGES Epetra GlobiPack OptiPack Domi PyTrilinos Moertel)
 SET(Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES ON)
 
 # If true, this option yields faster builds. In that case, however, it won't disable any upstream package that fails to compile.
-SET(Trilinos_CTEST_DO_ALL_AT_ONCE FALSE)
+SET(Trilinos_CTEST_DO_ALL_AT_ONCE TRUE)
 
 # Because Trilinos_CTEST_DO_ALL_AT_ONCE is set to OFF above,
 # the packages in Trilinos_EXCLUDE_PACKAGES above must also be disabled explicitly in EXTRA_CONFIGURE_OPTIONS

cmake/ctest/drivers/rocketman/mpi_release_tpetra_deprecated_code_off_downstream_enabled_no_epetra.cmake

@@ -79,7 +79,7 @@ SET(Trilinos_EXCLUDE_PACKAGES Epetra GlobiPack OptiPack Domi PyTrilinos Moertel)
 SET(Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES ON)
 
 # If true, this option yields faster builds. In that case, however, it won't disable any upstream package that fails to compile.
-SET(Trilinos_CTEST_DO_ALL_AT_ONCE FALSE)
+SET(Trilinos_CTEST_DO_ALL_AT_ONCE TRUE)
 
 # Because Trilinos_CTEST_DO_ALL_AT_ONCE is set to OFF above,
 # the packages in Trilinos_EXCLUDE_PACKAGES above must also be disabled explicitly in EXTRA_CONFIGURE_OPTIONS

cmake/std/atdm/README.md

@@ -494,9 +494,10 @@ the `checkin-test-atdm.sh` script is run and will set these as the defaults
 ## ctest-s-local-test-driver.sh
 
 When one wants to run local builds to test a branch and submit results to
-CDash so that they are archived and for others to see, then a simple way to
-that is to use the provided `ctest-s-local-test-driver.sh` script.  This
-script uses the CTest -S Jenkins driver system in the directory
+CDash (so that they are archived and for others to see), then a simple way to
+that is to use the provided
+[`ctest-s-local-test-driver.sh`](https://github.com/trilinos/Trilinos/blob/develop/cmake/std/atdm/ctest-s-local-test-driver.sh)
+script.  This script uses the CTest -S Jenkins driver system in the directory
 `Trilinos/cmake/ctest/drivers/atdm/` and the specific Jenkins driver files in
 the directory
 
@@ -513,22 +514,40 @@ $ cd <some_base_build_dir>/
 $ ln -s <some_base_dir>/Trilinos/cmake/std/atdm/ctest-s-local-test-driver.sh .
 ````
 
-Then run any of the build names (e.g. `gnu-opt-debug`) listed in the variable
-`ATDM_CONFIG_ALL_SUPPORTED_BUILDS` in the file
-`cmake/std/atdm/<system_name>/all_supported_builds.sh` (or `all` for all of
-the defined builds) for the system as:
+Then one can run any of the builds with defined driver files listed under:
+
+```
+    Trilinos/cmake/ctest/drivers/atdm/<system_name>/drivers/
+      <full-build-name-1>.sh
+      <full-build-name-2>.sh
+      ...
+```
+
+using:
 
 ```
 $ env \
     Trilinos_PACKAGES=<pkg0>,<pkg1>,... \
+    ATDM_CTEST_S_USE_FULL_BUILD_NAME=1 \
   ./ctest-s-local-test-driver.sh <build-base-name-0> <build-base-name-1> ...
 ```
 
-That will submit results to the Trilinos CDash project to the "Experimental"
-CDash Group (the CDash group can not be changed).  This will automatically
-allocate nodes and run just like it was running as a Jenkins job so the
-details of how this is done are completely taken care of by the existing setup
-for the current system.
+(Or leave out `Trilinos_PACKAGES` to test all of the ATDM packages.)  That
+will submit results to the Trilinos CDash project to the "Experimental" Group
+(the CDash group cannot be changed).  This will automatically allocate nodes
+and run just like it was running as a Jenkins job so the details of how this
+is done are completely taken care of by the existing setup for the current
+system.
+
+To run all of the supported builds listed in the variable
+`ATDM_CONFIG_ALL_SUPPORTED_BUILDS` in the file
+`cmake/std/atdm/<system_name>/all_supported_builds.sh`, use:
+
+```
+$ env \
+    Trilinos_PACKAGES=<pkg0>,<pkg1>,... \
+  ./ctest-s-local-test-driver.sh all
+```
 
 One can examine the progress of the builds and tests locally by looking at the
 generated files:
@@ -537,9 +556,8 @@ generated files:
   <some_base_build_dir>/<full_build_name>/smart-jenkins-driver.out
 ```
 
-(e.g. `<full_build_name>` = `Trilinos-atdm-<system_name>-gnu-opt-debug`) and
-also examine the generated `*.xml` configure, build, and test files created
-under:
+and also examine the generated `*.xml` configure, build, and test files
+created under:
 
 ```
   <some_base_build_dir>/<full_build_name>/SRC_AND_BUILD/BUILD/Testing/
@@ -556,10 +574,28 @@ $ env \
   ./ctest-s-local-test-driver.sh <build-base-name-0> <build-base-name-1> ...
 ```
 
-See
+One can also do run local installs using:
+
+```
+$ env \
+    Trilinos_PACKAGES=<pkg0>,<pkg1>,... \
+    ATDM_CONFIG_TRIL_CMAKE_INSTALL_PREFIX=install \
+    CTEST_DO_INSTALL=ON \
+  ./ctest-s-local-test-driver.sh <build-base-name-0> <build-base-name-1> ...
+```
+
+That will install the enabled Trilinos packages under:
+
+```
+  <full-build-name>/SRC_AND_BUILD/BUILD/install/
+```
+
+For more details, see the help documentation in the scirpt itself
+[`ctest-s-local-test-driver.sh`](https://github.com/trilinos/Trilinos/blob/develop/cmake/std/atdm/ctest-s-local-test-driver.sh). Also,
+see
 [TRIBITS_CTEST_DRIVER()](https://tribits.org/doc/TribitsDevelopersGuide.html#determining-what-testing-related-actions-are-performed-tribits-ctest-driver)
 for a description of all of the options that can be set as env vars to, for
-example, skip configure, skip the build, skip running tests, etc.
+example, skip the configure, skip the build, skip running tests, etc.
 
 
 ## Specific instructions for each system

cmake/std/atdm/cee-rhel6/environment.sh

@@ -223,7 +223,7 @@ export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NET
 if [[ "${ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" == "" ]] ; then
   # Set the default which is correct for all of the new TPL builds
   export ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS=${SUPERLUDIST_ROOT}/include
-  export ATDM_CONFIG_SUPERLUDIST_LIBS=${SUPERLUDIST_ROOT}/lib/libsuperlu_dist.a
+  export ATDM_CONFIG_SUPERLUDIST_LIBS=${SUPERLUDIST_ROOT}/lib64/libsuperlu_dist.a
 fi
 
 # Finished!