Use official implementation of El::MaxAbs (fixes #332) (#333)

davidsblom · Aug 27, 2016 · 8e9753d · 8e9753d
1 parent c0dfbc2
commit 8e9753d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/src/RBFMeshMotionSolver/AdaptiveCoarsening.C b/src/RBFMeshMotionSolver/AdaptiveCoarsening.C
@@ -220,7 +220,7 @@ namespace rbf
         if ( not rbf->initialized() )
         {
             // Only do a greedy selection if the values actually mean something
-            double maxAbs = rbf::MaxAbs( *values );
+            double maxAbs = El::MaxAbs( *values );
 
             if ( maxAbs > 0 )
             {

diff --git a/src/RBFMeshMotionSolver/AdaptiveCoarsening.H b/src/RBFMeshMotionSolver/AdaptiveCoarsening.H
@@ -54,28 +54,4 @@ namespace rbf
             std::unique_ptr<El::DistMatrix<double> > positions;
             std::unique_ptr<El::DistMatrix<double> > positionsInterpolation;
     };
-
-    template<typename Real>
-    Real MaxAbs( const El::DistMatrix<Real> & A )
-    {
-        Real value = 0;
-
-        if ( A.Participating() )
-        {
-            // Store the index/value of the local pivot candidate
-            const El::Int mLocal = A.LocalHeight();
-            const El::Int nLocal = A.LocalWidth();
-            const Real * ABuf = A.LockedBuffer();
-            const El::Int ALDim = A.LDim();
-
-            for ( El::Int jLoc = 0; jLoc < nLocal; ++jLoc )
-                for ( El::Int iLoc = 0; iLoc < mLocal; ++iLoc )
-                    value = El::Max( std::abs( value ), ABuf[iLoc + jLoc * ALDim] );
-
-            value = El::mpi::AllReduce( value, El::mpi::MAX, A.DistComm() );
-        }
-
-        El::mpi::Broadcast( value, A.Root(), A.CrossComm() );
-        return value;
-    }
 }
diff --git a/src/thirdParty/elemental b/src/thirdParty/elemental
+18 −9		CMakeLists.txt
+1 −1		package/elemental.spec
+141 −0		src/blas_like/level1/MaxAbs.cpp
+108 −0		tests/blas_like/MaxAbs.cpp