[cig-commits] r13135 - in short/3D/PyLith/trunk/libsrc: feassemble utils

[brad at geodynamics.org]

Author: brad
Date: 2008-10-26 16:25:41 -0700 (Sun, 26 Oct 2008)
New Revision: 13135

Modified:
   short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
   short/3D/PyLith/trunk/libsrc/utils/lapack.h
Log:
Revert to non-PETSc interface to dgesvd.

Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2008-10-26 23:19:09 UTC (rev 13134)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2008-10-26 23:25:41 UTC (rev 13135)
@@ -421,9 +421,9 @@
       const int n2 = n*n;
       for (int i = 0; i < n2; ++i)
 	elemMat[i] = _cellMatrix[i];
-      LAPACKdgesvd("N", "N", &n, &n, elemMat, &n, svalues, 
-		   &sdummy, &idummy, &sdummy, &idummy, work,
-		   &lwork, &lierr);
+      lapack_dgesvd("N", "N", &n, &n, elemMat, &n, svalues, 
+		    &sdummy, &idummy, &sdummy, &idummy, work,
+		    &lwork, &lierr);
       if (lierr)
 	throw std::runtime_error("Lapack SVD failed");
       minSV = svalues[n-1];

Modified: short/3D/PyLith/trunk/libsrc/utils/lapack.h
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/lapack.h	2008-10-26 23:19:09 UTC (rev 13134)
+++ short/3D/PyLith/trunk/libsrc/utils/lapack.h	2008-10-26 23:25:41 UTC (rev 13135)
@@ -20,21 +20,23 @@
 #if !defined(pylith_utils_lapack_h)
 #define pylith_utils_lapack_h
 
+#define lapack_dgesvd dgesvd_
+
 extern "C" {
-  EXTERN void LAPACKdgesvd(const char*,
-			   const char*,
-			   PetscBLASInt*,
-			   PetscBLASInt*,
-			   PetscScalar*,
-			   PetscBLASInt*,
-			   PetscReal*,
-			   PetscScalar*,
-			   PetscBLASInt*,
-			   PetscScalar*,
-			   PetscBLASInt*,
-			   PetscScalar*,
-			   PetscBLASInt*,
-			   PetscBLASInt*);
+  EXTERN void lapack_dgesvd(const char*,
+			    const char*,
+			    PetscBLASInt*,
+			    PetscBLASInt*,
+			    PetscScalar*,
+			    PetscBLASInt*,
+			    PetscReal*,
+			    PetscScalar*,
+			    PetscBLASInt*,
+			    PetscScalar*,
+			    PetscBLASInt*,
+			    PetscScalar*,
+			    PetscBLASInt*,
+			    PetscBLASInt*);
 }
 
 #endif // pylith_utils_lapack_h