Commits

Vijay Mahadevan  committed 8fe2973 Merge

Merged petsc/petsc into master

  • Participants
  • Parent commits d9d5c77, be376a7

Comments (0)

Files changed (4)

File config/configure.py

     name = opt.split('=')[0]
     if name.find('_') >= 0:
       exception = False
-      for exc in ['superlu_dist', 'PETSC_ARCH', 'PETSC_DIR', 'CXX_CXXFLAGS', 'LD_SHARED', 'CC_LINKER_FLAGS', 'CXX_LINKER_FLAGS', 'FC_LINKER_FLAGS', 'AR_FLAGS', 'C_VERSION', 'CXX_VERSION', 'FC_VERSION', 'size_t', 'MPI_Comm','MPI_Fint']:
+      for exc in ['superlu_dist', 'PETSC_ARCH', 'PETSC_DIR', 'CXX_CXXFLAGS', 'LD_SHARED', 'CC_LINKER_FLAGS', 'CXX_LINKER_FLAGS', 'FC_LINKER_FLAGS', 'AR_FLAGS', 'C_VERSION', 'CXX_VERSION', 'FC_VERSION', 'size_t', 'MPI_Comm','MPI_Fint','int64_t']:
         if name.find(exc) >= 0:
           exception = True
       if not exception:

File src/docs/tex/petscapp.bib

 % LiteralHTML:
 % LiteralHTML:  <a name="nano"><H3><center>Nano-simulations</center></H3>
 % LiteralHTML:
+@INPROCEEDINGS{asc2013,
+  author = "S. Abhyankar and B. F. Smith and E. Constantinescu",
+  title  = "Evaluation of overlapping restricted additive Schwarz preconditioning for parallel solution of very large power flow problems",
+  booktitle =  "HiPCNA-PG’13",
+  year =  2013
+}
+@INPROCEEDINGS{as2013,
+  author = "S. Abhyankar and B. F. Smith",
+  title  = "{PETSc:} An Advanced Math and Computing Framework for Rapidly Developing Parallel Smart Grid Applications",
+  booktitle =  "Proceedings of the IEEE PES General Meeting",
+  year =  2013
+}
+@techreport{tspaper,
+  title       = {{PETSc/TS}: A Modern Scalable {DAE/ODE} Solver Library},
+  author      = {Shrirang Abhyankar and Jed Brown and Emil Constantinescu and Debojyoti Ghosh and Barry F. Smith},
+  type        = {Preprint},
+  number      = {ANL/MCS-P5061-0114},
+  institution = {ANL},
+  month       = {January},
+  year        = {2014}
+}
 @TechReport{bb2008,
   author = "Tomasz Blachowicz and Bartlomiej Baron",
   title = "A graphical extension for the Windows version of the Parallel Finite Element Micromagnetics Package (MagParExt)",
   journal={Journal of Glaciology},
   volume={59},
   number={215},
-  pages={449},
-  year={2013}
+  pages={449--466},
+  year={2013},
+  doi = {10.3189/2013JoG12J140}
+}
+@Article{takei2013anisotropy1,
+  author =	 {Takei Y. and R.F. Katz},
+  title =	 {{Consequences of viscous anisotropy in a deforming,
+                  two-phase aggregate: 1. Governing equations and
+                  linearised analysis}},
+  journal =	 {J.\ Fluid\ Mech.},
+  year =	 2013,
+  volume =	 734,
+  pages =	 {424-455},
+  doi =          {10.1017/jfm.2013.482}
+}
+@Article{katz2013anisotropy2,
+  author =	 {Katz R.F. and Y. Takei},
+  title =	 {{Consequences of viscous anisotropy in a deforming,
+                  two-phase aggregate: 2. Numerical solutions of the
+                  full equations}},
+  journal =	 {J.\ Fluid\ Mech.},
+  year =	 2013,
+  volume =	 734,
+  pages =	 {456-485},
+  doi =          {10.1017/jfm.2013.483}
+}
+@Article{kyrke-smith2014subglacial,
+  author = 	 {Kyrke-Smith, T.M. and R.F. Katz and A.C. Fowler},
+  title = 	 {Subglacial hydrology and the formation of ice streams},
+  journal = 	 {Proc.\ Roy.\ Soc.\ A},
+  year = 	 {2014},
+  volume = 	 {470},
+  number = 	 {2161},
+  doi = 	 {10.1098/rspa.2013.0494}
 }
 @article{bueler2009shallow,
   title={{Shallow shelf approximation as a ``sliding law'' in a thermomechanically coupled ice sheet model}},
   author = "Lois Curfman McInnes and Barry Smith and Hong Zhang and Richard Tran Mills",
   number = {40},
   pages  = {17--31},
-  year   = {2014}
+  year   = {2014},
   journal = "Parallel Computing",
   url = "http://dx.doi.org/10.1016/j.parco.2013.10.001"
 }

File src/snes/examples/tutorials/ex7.c

   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
   ierr = DMDACreate2d(PETSC_COMM_WORLD, DMDA_BOUNDARY_NONE, DMDA_BOUNDARY_NONE,DMDA_STENCIL_BOX,-3,-3,PETSC_DECIDE,PETSC_DECIDE,3,1,NULL,NULL,&da);CHKERRQ(ierr);
   ierr = DMDASetFieldName(da, 0, "ooblek");CHKERRQ(ierr);
-  ierr = DMSetApplicationContext(da,&user);CHKERRQ(ierr);
+  ierr = DMSetApplicationContext(da,user);CHKERRQ(ierr);
   ierr = SNESSetDM(snes, (DM) da);CHKERRQ(ierr);
 
   /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Set the discretization functions
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-  ierr = DMDASNESSetFunctionLocal(da,INSERT_VALUES,(PetscErrorCode (*)(DMDALocalInfo*,void*,void*,void*))FormFunctionLocal,&user);CHKERRQ(ierr);
-  ierr = DMDASNESSetJacobianLocal(da,(PetscErrorCode (*)(DMDALocalInfo*,void*,Mat,Mat,MatStructure*,void*))FormJacobianLocal,&user);CHKERRQ(ierr);
+  ierr = DMDASNESSetFunctionLocal(da,INSERT_VALUES,(PetscErrorCode (*)(DMDALocalInfo*,void*,void*,void*))FormFunctionLocal,user);CHKERRQ(ierr);
+  ierr = DMDASNESSetJacobianLocal(da,(PetscErrorCode (*)(DMDALocalInfo*,void*,Mat,Mat,MatStructure*,void*))FormJacobianLocal,user);CHKERRQ(ierr);
   ierr = SNESSetFromOptions(snes);CHKERRQ(ierr);
 
   ierr = SNESSetComputeInitialGuess(snes, FormInitialGuess,NULL);CHKERRQ(ierr);

File src/snes/examples/tutorials/output/ex21_1.out

   0 SNES Function norm 0.866025 
-    0 KSP Residual norm 8.660254037844e-01 
-    1 KSP Residual norm 5.113221896690e-01 
-    2 KSP Residual norm 1.566837543463e-01 
-    3 KSP Residual norm 1.125580290707e-01 
-    4 KSP Residual norm 1.060147337784e-01 
-    5 KSP Residual norm 1.050118121352e-01 
-    6 KSP Residual norm 1.040785570055e-01 
-    7 KSP Residual norm 7.804415505680e-02 
-    8 KSP Residual norm 1.195696422191e-02 
-    9 KSP Residual norm 3.694080068906e-03 
-   10 KSP Residual norm 1.639230932038e-15 
+    0 KSP Residual norm 0.866025 
+    1 KSP Residual norm 0.511322 
+    2 KSP Residual norm 0.156684 
+    3 KSP Residual norm 0.112558 
+    4 KSP Residual norm 0.106015 
+    5 KSP Residual norm 0.105012 
+    6 KSP Residual norm 0.104079 
+    7 KSP Residual norm 0.0780442 
+    8 KSP Residual norm 0.011957 
+    9 KSP Residual norm 0.00369408 
+   10 KSP Residual norm < 1.e-11
       Line search: Using full step: fnorm 8.660254037844e-01 gnorm 4.873279917558e-10
   1 SNES Function norm 4.873e-10 
 Nonlinear solve converged due to CONVERGED_FNORM_RELATIVE iterations 1