Merge branch 'barry/fix-chaco' into next

petsc · Feb 14, 2014 · f6430e7 · f6430e7
2 parents 09da2c9 + e685f91
commit f6430e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/config/BuildSystem/config/package.py b/config/BuildSystem/config/package.py
@@ -422,6 +422,7 @@ def downLoad(self):
     err =''
     if not self.downloadURLSetByUser and hasattr(self.sourceControl, 'git') and self.gitcommit and self.gitPreReqCheck():
       for giturl in self.giturls: # First try to fetch using Git
+        self.logPrintBox('Trying to download '+giturl+' for '+self.PACKAGE)
         try:
           gitrepo = os.path.join(self.externalPackagesDir, self.downloadname)
           self.executeShellCommand([self.sourceControl.git, 'clone', giturl, gitrepo])
@@ -432,6 +433,7 @@ def downLoad(self):
           self.logPrint('ERROR: '+str(e))
           err += str(e)
     for url in download_urls:
+      self.logPrintBox('Trying to download '+url+' for '+self.PACKAGE)
       try:
         retriever.genericRetrieve(url, self.externalPackagesDir, self.downloadname)
         self.framework.actions.addArgument(self.PACKAGE, 'Download', 'Downloaded '+self.name+' into '+self.getDir(0))

diff --git a/config/PETSc/packages/Chaco.py b/config/PETSc/packages/Chaco.py
@@ -15,6 +15,11 @@ def __init__(self, framework):
     self.downloadonWindows = 1
     return
 
+  def setupDependencies(self, framework):
+    PETSc.package.NewPackage.setupDependencies(self, framework)
+    self.dfunctions = framework.require('config.functions',self)
+    return
+
   def Install(self):
     import os
     self.framework.log.write('chacoDir = '+self.packageDir+' installDir '+self.installDir+'\n')
@@ -37,3 +42,8 @@ def Install(self):
       self.postInstall(output+err, mkfile)
     return self.installDir
 
+  def configureLibrary(self):
+    PETSc.package.NewPackage.configureLibrary(self)
+    if self.dfunctions.check('ddot_',self.lib):
+      raise RuntimeError('You cannot use Chaco package from Sandia as it contains an incorrect ddot() routine that conflicts with BLAS\nUse --download-chaco')
+
diff --git a/src/vec/vec/utils/vecmpitoseq.c b/src/vec/vec/utils/vecmpitoseq.c
@@ -101,8 +101,8 @@ PetscErrorCode  VecScatterCreateToAll(Vec vin,VecScatter *ctx,Vec *vout)
 $        VecScatterEnd(ctx,vin,vout,INSERT_VALUES,SCATTER_FORWARD);
 $
 $        // destroy scatter context and local vector when no longer needed
-$        VecScatterDestroy(ctx);
-$        VecDestroy(vout);
+$        VecScatterDestroy(&ctx);
+$        VecDestroy(&vout);
 
 .seealso VecScatterCreate(), VecScatterCreateToAll(), VecScatterBegin(), VecScatterEnd()