[cig-commits] [commit] rajesh-petsc-schur: Merge branch 'master' into rajesh-petsc-schur (d1f02d7)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit d1f02d71caba7887049556189e403be6aed42c01
Merge: 7a649c4 ece8bb9
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Fri Oct 10 12:17:36 2014 -0700

    Merge branch 'master' into rajesh-petsc-schur
    
    Conflicts:
    	configure.ac
    	doc/citcoms-manual.pdf
    	doc/citcoms-manual.tex
    	lib/Composition_related.c
    	lib/Full_tracer_advection.c
    	lib/Regional_tracer_advection.c
    	lib/Tracer_setup.c
    	lib/Viscosity_structures.c



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d1f02d71caba7887049556189e403be6aed42c01