Merge pull request #7 from firedrakeproject/ksagiyam/merge_upstream

Ksagiyam/merge upstream

.gitignore

@@ -19,6 +19,7 @@ asterix*/*
 linux*/*
 darwin*/*
 arch-*/*
+*-arch-*/*
 petsc-install/*
 batch-test
 c_test
@@ -28,13 +29,16 @@ TAGS*
 bmake/*/*
 lib/petsc/conf/petscvariables
 configure.log*
+reconfigure-*.py
 externalpackages/*
+petscLintPatches/
 ftn-auto
 ftn-auto-interfaces
 make_log_*
 test_log_*
 src/python/*
 *.o
+*.pch
 *.pyc
 *~
 *.orig
@@ -70,7 +74,6 @@ makefile.html
 *.cpp.html
 *.hh.html
 *.sidl.html
-src/docs/website/publications/generated_topics.html
 src/dm/mesh/tests/unitTests
 src/dm/mesh/tutorials/*_quadrature.h
 src/dm/mesh/tutorials/*.vtk
@@ -90,13 +93,13 @@ GRTAGS
 GSYMS
 GTAGS
 CMakeLists.txt
+petsc-doc-env
 src/binding/petsc4py/.eggs
 src/binding/petsc4py/src/include/petsc4py/petsc4py.PETSc.h
 src/binding/petsc4py/src/include/petsc4py/petsc4py.PETSc_api.h
 src/binding/petsc4py/src/libpetsc4py/libpetsc4py.c
 src/binding/petsc4py/src/libpetsc4py/libpetsc4py.h
 src/binding/petsc4py/src/petsc4py.PETSc.c
-src/docs/sphinx_docs/_build
 src/snes/tutorials/ex52\.h
 src/snes/tutorials/ex52_inline\.h
 src/snes/tutorials/ex56_inline\.h
@@ -169,22 +172,10 @@ src/benchmarks/streams/OpenMPVersion
 src/benchmarks/streams/PthreadVersion
 src/benchmarks/streams/scaling.png
 horse.ply
-src/docs/tao_tex/manual/sindex.tex
-src/docs/tao_tex/manual/findex.tex
-src/docs/tao_tex/manual/*.aux
-src/docs/tao_tex/manual/*.bbl
-src/docs/tao_tex/manual/*.blg
-src/docs/tao_tex/manual/*.idx
-src/docs/tao_tex/manual/*.ilg
-src/docs/tao_tex/manual/*.ind
-src/docs/tao_tex/manual/*.out
-src/docs/tao_tex/manual/*.toc
-src/docs/tao_tex/manual/*.dvi
 /docs/
 **/f90module*.f90
 compile_commands.json
+.clang-format
 .clangd/
 .cache/
 .vscode/
-sphinx_docs_env
-venv-petsc-docs