Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 7 commits
  • 8 files changed
  • 0 commit comments
  • 3 contributors
Commits on Dec 20, 2013
@slepc slepc Fix Matlab viewer for parallel complex vectors
In complex vectors, the output of the Matlab viewer was different
for sequential or parallel vectors. In parallel vectors, there was
a whitespace between the imaginary part and the imaginary unit "i"
hence causing problems when loading in Matlab.
e0b9482
@slepc slepc Correctly check input type of Mat argument in MatMPIAIJGetLocalMat
MatMPIAIJGetLocalMat requires MPIAIJ matrix as input, but it used
a explicit cast in the declaration of variables, before checking that
the input Mat is actually of this type.
b78526a
Commits on Jan 31, 2014
@jedbrown jedbrown VecScatterCreateToZero: fix man page
Reported-by: Dave May <dave.mayhem23@gmail.com>
7e441cd
Commits on Feb 01, 2014
@jedbrown jedbrown Merge branch 'jose/mat-vec-fixes' into maint
* jose/mat-vec-fixes:
  Correctly check input type of Mat argument in MatMPIAIJGetLocalMat
  Fix Matlab viewer for parallel complex vectors
7a2f779
Commits on Feb 14, 2014
@BarrySmith BarrySmith check for ddot_() in chaco and reject it
print download packages before downloading
e685f91
Commits on Feb 16, 2014
@jedbrown jedbrown DT: remove spurious printing c7322fd
Commits on Feb 18, 2014
@BarrySmith BarrySmith fixed hdf5.py so that if self.libraries.compression is None the code …
…still runs correctly
4ded9de
View
2  config/BuildSystem/config/package.py
@@ -407,6 +407,7 @@ def downLoad(self):
err =''
if hasattr(self.sourceControl, 'git') and self.gitcommit:
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])
@@ -417,6 +418,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))
View
5 config/BuildSystem/config/packages/hdf5.py
@@ -25,8 +25,9 @@ def generateLibList(self, framework):
list = []
for l in self.liblist:
list.append(l)
- for l in self.liblist:
- list.append(l + self.libraries.compression)
+ if self.libraries.compression:
+ for l in self.liblist:
+ list.append(l + self.libraries.compression)
self.liblist = list
return config.package.Package.generateLibList(self,framework)
View
10 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')
+
View
1  src/dm/dt/examples/tests/output/ex1_1.out
@@ -24,7 +24,6 @@ degree 2 at 1: B= 1 D= 3 D2= 3
degree 3 at 1: B= 1 D= 6 D2= 15
degree 4 at 1: B= 1 D= 10 D2= 45
degree 5 at 1: B= 1 D= 15 D2= 105
- 0: 5.7735e-01 5.1640e-01 5.0709e-01 5.0395e-01
Quadrature weights
0: 1.7770e-01 3.5897e-01 4.2667e-01 3.5897e-01 1.7770e-01
Moment error: zeroth=3.33067e-16, first=1.38778e-16, second=-5.55112e-17
View
1  src/dm/dt/interface/dt.c
@@ -114,7 +114,6 @@ PetscErrorCode PetscDTGaussQuadrature(PetscInt npoints,PetscReal a,PetscReal b,P
x[i] = 0; /* diagonal is 0 */
if (i) w[i-1] = 0.5 / PetscSqrtReal(1 - 1./PetscSqr(2*i));
}
- ierr = PetscRealView(npoints-1,w,PETSC_VIEWER_STDOUT_SELF);CHKERRQ(ierr);
ierr = PetscMalloc2(npoints*npoints,PetscScalar,&Z,PetscMax(1,2*npoints-2),PetscReal,&work);CHKERRQ(ierr);
ierr = PetscBLASIntCast(npoints,&N);CHKERRQ(ierr);
LDZ = N;
View
10 src/mat/impls/aij/mpi/mpiaij.c
@@ -4994,9 +4994,9 @@ PetscErrorCode MatMPIAIJGetLocalMat(Mat A,MatReuse scall,Mat *A_loc)
{
PetscErrorCode ierr;
Mat_MPIAIJ *mpimat=(Mat_MPIAIJ*)A->data;
- Mat_SeqAIJ *mat,*a=(Mat_SeqAIJ*)(mpimat->A)->data,*b=(Mat_SeqAIJ*)(mpimat->B)->data;
- PetscInt *ai=a->i,*aj=a->j,*bi=b->i,*bj=b->j,*cmap=mpimat->garray;
- MatScalar *aa=a->a,*ba=b->a,*cam;
+ Mat_SeqAIJ *mat,*a,*b;
+ PetscInt *ai,*aj,*bi,*bj,*cmap=mpimat->garray;
+ MatScalar *aa,*ba,*cam;
PetscScalar *ca;
PetscInt am=A->rmap->n,i,j,k,cstart=A->cmap->rstart;
PetscInt *ci,*cj,col,ncols_d,ncols_o,jo;
@@ -5006,6 +5006,10 @@ PetscErrorCode MatMPIAIJGetLocalMat(Mat A,MatReuse scall,Mat *A_loc)
ierr = PetscObjectTypeCompare((PetscObject)A,MATMPIAIJ,&match);CHKERRQ(ierr);
if (!match) SETERRQ(PetscObjectComm((PetscObject)A), PETSC_ERR_SUP,"Requires MPIAIJ matrix as input");
ierr = PetscLogEventBegin(MAT_Getlocalmat,A,0,0,0);CHKERRQ(ierr);
+ a = (Mat_SeqAIJ*)(mpimat->A)->data;
+ b = (Mat_SeqAIJ*)(mpimat->B)->data;
+ ai = a->i; aj = a->j; bi = b->i; bj = b->j;
+ aa = a->a; ba = b->a;
if (scall == MAT_INITIAL_MATRIX) {
ierr = PetscMalloc((1+am)*sizeof(PetscInt),&ci);CHKERRQ(ierr);
ci[0] = 0;
View
4 src/vec/vec/impls/mpi/pdvec.c
@@ -81,9 +81,9 @@ PetscErrorCode VecView_MPI_ASCII(Vec xin,PetscViewer viewer)
for (i=0; i<n; i++) {
#if defined(PETSC_USE_COMPLEX)
if (PetscImaginaryPart(values[i]) > 0.0) {
- ierr = PetscViewerASCIIPrintf(viewer,"%18.16e + %18.16e i\n",PetscRealPart(values[i]),PetscImaginaryPart(values[i]));CHKERRQ(ierr);
+ ierr = PetscViewerASCIIPrintf(viewer,"%18.16e + %18.16ei\n",PetscRealPart(values[i]),PetscImaginaryPart(values[i]));CHKERRQ(ierr);
} else if (PetscImaginaryPart(values[i]) < 0.0) {
- ierr = PetscViewerASCIIPrintf(viewer,"%18.16e - %18.16e i\n",PetscRealPart(values[i]),-PetscImaginaryPart(values[i]));CHKERRQ(ierr);
+ ierr = PetscViewerASCIIPrintf(viewer,"%18.16e - %18.16ei\n",PetscRealPart(values[i]),-PetscImaginaryPart(values[i]));CHKERRQ(ierr);
} else {
ierr = PetscViewerASCIIPrintf(viewer,"%18.16e\n",PetscRealPart(values[i]));CHKERRQ(ierr);
}
View
4 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()

No commit comments for this range

Something went wrong with that request. Please try again.