Merge 'trilinos/Trilinos:develop' (5efb425) into 'tcad-charon/Trilino…

…s:develop' (6c6e315).

* trilinos-develop:
  zoltan2:  removing unused file
  Tpetra: fix scalar error in test
  ATDM/cee-rhel6: Remove problematic lib path (ATDV-272)
  ATDM/cee-rhel6: Update LD_LIBRARY_PATH for git update (ATDV-272)

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

@@ -199,6 +199,8 @@ fi
 # to be safe.  Also, we need to set OMP_* env vars here because the SPARC
 # modules change them!
 
+atdm_remove_substrings_from_env_var LD_LIBRARY_PATH ":" "/usr/local/epd/canopy2/opt/Canopy/edm/envs/User/lib"
+
 # Use updated Ninja and CMake
 module load sems-env
 module load sems-cmake/3.12.2

packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp

@@ -391,9 +391,9 @@ namespace { // (anonymous)
       size_t vecOffset = vec * numLocalRows;
       for(size_t i = 0; i < numLocalRows - 1; i++)
       {
-        TEST_EQUALITY(5.0 * ST::one(), vvals[vecOffset + i]);
+        TEST_EQUALITY(static_cast<Mag>(5.0) * ST::one(), vvals[vecOffset + i]);
       }
-      TEST_EQUALITY(Scalar((double) numLocalColumns * ST::one()), Scalar(vvals[vecOffset + numLocalRows - 1]));
+      TEST_EQUALITY(static_cast<Mag>(numLocalColumns) * ST::one(), vvals[vecOffset + numLocalRows - 1]);
     }
     if(numVecs != 1)
     {
@@ -405,9 +405,9 @@ namespace { // (anonymous)
       vcol->get1dCopy(vvals(), numLocalRows);
       for(size_t i = 0; i < numLocalRows - 1; i++)
       {
-        TEST_EQUALITY(5.0 * ST::one(), vvals[i]);
+        TEST_EQUALITY(static_cast<Mag>(5.0) * ST::one(), vvals[i]);
       }
-      TEST_EQUALITY(Scalar((double) numLocalColumns * ST::one()), Scalar(vvals[numLocalRows - 1]));
+      TEST_EQUALITY(static_cast<Mag>(numLocalColumns) * ST::one(), vvals[numLocalRows - 1]);
       //Finally, test residual.
       V res(rowMap);
       //Here, have A*wcol = vcol. This means the residual of A, wcol, and vcol should be 0.