Commits

Satish Balay  committed 844c422 Merge

Merge branch 'master' into next

  • Participants
  • Parent commits 0a36f54, deaff7b
  • Branches knepley/fix-quadrature-order, next-oct-2014

Comments (0)

Files changed (7)

File bin/maint/confignightly/churn2

 set MACH=churn
 set USR=petsc
 set LOC=/sandbox/petsc/${RNAME}-2
-set CONF=arch-linux-cxx
+set CONF=arch-linux-cxx-cmplx-pkgs-64idx

File bin/maint/confignightly/petsc-mini4

+#! /bin/csh
+
+set MACH=petsc-mini
+set USR=petsc
+set LOC=/Users/petsc/${RNAME}-4
+set CONF=arch-osx-pgi-pkgs-opt

File config/BuildSystem/config/compilers.py

         # Check for '-rpath /sharedlibpath/ or -R /sharedlibpath/'
         if arg == '-rpath' or arg == '-R':
           lib = argIter.next()
+          if lib.startswith('-'): continue # perhaps the path was striped due to quotes?
           if lib.startswith('"') and lib.endswith('"') and lib.find(' ') == -1: lib = lib[1:-1]
           lib = os.path.abspath(lib)
           if lib in ['/usr/lib','/lib','/usr/lib64','/lib64']: continue
         # Check for '-rpath /sharedlibpath/ or -R /sharedlibpath/'
         if arg == '-rpath' or arg == '-R':
           lib = argIter.next()
+          if lib.startswith('-'): continue # perhaps the path was striped due to quotes?
           if lib.startswith('"') and lib.endswith('"') and lib.find(' ') == -1: lib = lib[1:-1]
           lib = os.path.abspath(lib)
           if lib in ['/usr/lib','/lib','/usr/lib64','/lib64']: continue
         if arg == '-rpath' or arg == '-R':
           lib = argIter.next()
           if lib == '\\': lib = argIter.next()
+          if lib.startswith('-'): continue # perhaps the path was striped due to quotes?
           if lib.startswith('"') and lib.endswith('"') and lib.find(' ') == -1: lib = lib[1:-1]
           lib = os.path.abspath(lib)
           if lib in ['/usr/lib','/lib','/usr/lib64','/lib64']: continue

File config/examples/arch-linux-cxx-cmplx-pkgs-64idx.py

+#!/usr/bin/env python
+
+configure_options = [
+  '--with-cc=clang',
+  '--with-fc=gfortran',
+  '--with-cxx=clang++',
+
+  '--with-clanguage=cxx',
+  '--with-scalar-type=complex',
+  '--with-64-bit-indices=1',
+
+  '--download-mpich=1',
+  '--download-cmake=1',
+  '--download-metis=1',
+  '--download-parmetis=1',
+  '--download-pastix=1',
+  '--download-ptscotch=1',
+  '--download-superlu_dist=1',
+
+  ]
+
+if __name__ == '__main__':
+  import sys,os
+  sys.path.insert(0,os.path.abspath('config'))
+  import configure
+  configure.petsc_configure(configure_options)

File config/examples/arch-osx-cxx-cmplx-pkgs-64idx.py

-#!/usr/bin/env python
-
-configure_options = [
-  '--with-cc=clang',
-  '--with-fc=gfortran', # homebrew
-  '--with-cxx=clang++',
-
-  '--with-clanguage=cxx',
-  '--with-scalar-type=complex',
-  '--with-64-bit-indices=1',
-
-  '--download-mpich=1',
-  '--download-cmake=1',
-  '--download-metis=1',
-  '--download-parmetis=1',
-  '--download-pastix=1',
-  '--download-ptscotch=1',
-  '--download-superlu_dist=1',
-
-  ]
-
-if __name__ == '__main__':
-  import sys,os
-  sys.path.insert(0,os.path.abspath('config'))
-  import configure
-  configure.petsc_configure(configure_options)

File config/examples/arch-osx-pgi-pkgs-opt.py

+#!/usr/bin/env python
+
+# Note: /Applications/Free PGI.app/Contents/Resources/pgi/osx86-64/14.3/include/va_list.h
+# is edited to worarround duplicate 'typedef' warnings. And the following to avoid link warning
+# cd "/Applications/Free PGI.app/Contents/Resources/pgi/osx86-64/14.3" && ln -s lib libso
+
+configure_options = [
+  '--with-cc=pgcc',
+  '--with-fc=pgfortran',
+  '--with-cxx=0', # osx PGI does not have c++? And autodetect code messes up -L "foo bar" paths
+
+  '--download-mpich=1',
+  '--download-mpich-device=ch3:nemesis', # socket code gives 'Error from ioctl = 6; Error is: : Device not configured'
+  '--download-cmake=1',
+  '--download-metis=1',
+  '--download-parmetis=1',
+  '--download-ptscotch=1',
+  '--download-triangle=1',
+  '--download-superlu=1',
+  '--download-superlu_dist=1',
+  '--download-scalapack=1',
+  '--download-mumps=1',
+  #'--download-parms=1',
+  #'--download-hdf5',
+  '--download-sundials=1',
+  #'--download-hypre=1',
+  '--download-suitesparse=1',
+  '--download-chaco=1',
+  '--download-spai=1',
+  #'--download-moab=1',
+  ]
+
+if __name__ == '__main__':
+  import sys,os
+  sys.path.insert(0,os.path.abspath('config'))
+  import configure
+  configure.petsc_configure(configure_options)

File src/mat/examples/tests/ex125.c

     ierr = MatGetFactor(A,MATSOLVERPETSC,MAT_FACTOR_LU,&F);CHKERRQ(ierr);
   }
 
-  info.fill = 5.0;
+  ierr           = MatFactorInfoInitialize(&info);CHKERRQ(ierr);
+  info.fill      = 5.0;
   info.shifttype = (PetscReal) MAT_SHIFT_NONE;
-  ierr      = MatLUFactorSymbolic(F,A,perm,iperm,&info);CHKERRQ(ierr);
+  ierr           = MatLUFactorSymbolic(F,A,perm,iperm,&info);CHKERRQ(ierr);
 
   for (nfact = 0; nfact < 2; nfact++) {
     if (!rank) printf(" %d-the LU numfactorization \n",nfact);