Skip to content

Commit

Permalink
Merge branch 'baagaard/example-3d-subduction'
Browse files Browse the repository at this point in the history
* baagaard/example-3d-subduction: (216 commits)
  Fix typo in Makefile.am.
  Updated list of changes.
  Fix EAR grant number.
  Improve color scheme.
  Updated code listings.
  Update code listings.
  Updates code listings.
  Updated code listings.
  Update code listings.
  Improve display of code listings.
  Add note on useful values for time step parameter in ParaView Python scripts.
  Add comments on why we need to move files to/from the Docker container.
  Added info on CUBIT/Trelis at beginning of examples.
  Updated script to use vectors rather than scalar components.
  Added tip on using trace for ParaView Python scripts.
  Convert slip inversion from using PETSc to PyLith Xdmf generator.
  Updated list of changes for v2.2.1.
  Updated list of changes for v2.2.1.
  Added overview of examples.
  Set version number to 2.2.1 (remove rc1).
  ...
  • Loading branch information
baagaard-usgs committed Sep 6, 2017
2 parents fc58b5d + 3c4fab7 commit 348c811
Show file tree
Hide file tree
Showing 187 changed files with 13,398 additions and 828 deletions.
41 changes: 18 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,14 @@
/GRTAGS
/GSYMS
/GTAGS
/doc/userguide/userguide.pdf
pylith_parameters.json
modulesrc/*/*_wrap.cxx
modulesrc/*/*.py
/templates/friction/frictioncontrib.py
/templates/friction/frictioncontrib_wrap.cxx
/templates/materials/materialscontrib.py
/templates/materials/materialscontrib_wrap.cxx
/doc/userguide/userguide.pdf
modulesrc/bc/bc.py
modulesrc/bc/bc_wrap.cxx
modulesrc/faults/faults.py
modulesrc/faults/faults_wrap.cxx
modulesrc/feassemble/feassemble.py
modulesrc/feassemble/feassemble_wrap.cxx
modulesrc/friction/friction.py
modulesrc/friction/friction_wrap.cxx
modulesrc/materials/materials.py
modulesrc/materials/materials_wrap.cxx
modulesrc/meshio/meshio.py
modulesrc/meshio/meshio_wrap.cxx
modulesrc/mpi/mpi.py
modulesrc/mpi/mpi_wrap.cxx
modulesrc/utils/petsc.py
modulesrc/utils/petsc_wrap.cxx
modulesrc/problems/problems.py
modulesrc/problems/problems_wrap.cxx
modulesrc/topology/topology.py
modulesrc/topology/topology_wrap.cxx
modulesrc/utils/utils.py
modulesrc/utils/utils_wrap.cxx
configure
aclocal.m4
Makefile.in
Expand All @@ -49,3 +30,17 @@ tests_auto/*/*/*_disp.spatialdb
tests_auto/*/*/output
tests_auto/*/*/output
examples/3d/hex8/output
examples/2d/subduction/output
examples/3d/subduction/output
examples/3d/subduction/mesh/geometry_surfs.jou
examples/3d/subduction/mesh/*.exo
examples/3d/subduction/mesh/*.sat
examples/3d/subduction/spatialdb/fault_slabtop_slowslip.spatialdb
examples/3d/subduction/spatialdb/fault_slabtop_slowslip.timedb
examples/3d/subduction/spatialdb/mat_initial_stress_grav-*.spatialdb
doc/userguide/userguide.toc
doc/userguide/userguide.aux
doc/userguide/userguide.lof
doc/userguide/userguide.log
doc/userguide/userguide.lot
doc/userguide/userguide.out
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "m4"]
path = m4
url = git://github.com/geodynamics/autoconf_cig.git
url = https://github.com/geodynamics/autoconf_cig.git
[submodule "templates/materials/m4"]
path = templates/materials/m4
url = git://github.com/geodynamics/autoconf_cig.git
url = https://github.com/geodynamics/autoconf_cig.git
[submodule "templates/friction/m4"]
path = templates/friction/m4
url = git://github.com/geodynamics/autoconf_cig.git
url = https://github.com/geodynamics/autoconf_cig.git
44 changes: 44 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,50 @@ MIGRATING FROM VERSION 2.1 TO 2.2
No changes are needed to parameter or other input files. The default
format for pylithinfo output is now JSON.

----------------------------------------------------------------------
Version 2.2.1
----------------------------------------------------------------------

* Added new examples.

- examples/3d/subduction: New suite of examples for a 3-D
subduction zone. This intermediate level suite of examples
illustrates a wide range of PyLith features for quasi-static simulations.

- examples/2d/subduction: Added quasi-static spontaneous rupture
earthquake cycle examples (Steps 5 and 6) for slip-weakening and
rate- and state-friction.

- These new examples make use of ParaView Python scripts to
facilitate using ParaView with PyLith.

* Improved the PyLith manual

- Added diagram to guide users on which installation method best
meets their needs.

- Added instructions for how to use the Windows Subsystem for
Linux to install the PyLith Linux binary on systems running
Windows 10.

* Fixed bug in generating Xdmf files for 2-D vector output. Converted
Xdmf generator from C++ to Python for more robust generation of Xdmf
files from Python scripts.

* Updated spatialdata to v1.9.10. Improved error messages when reading
SimpleDB and SimpleGridDB files.

* Updated PyLith parameter viewer to v1.1.0. Application and
documentation are now available on line at
https://geodynamics.github.io/pylith_parameters. Small fix to insure
hierarchy path listed matches the one for PyLith.

* Updated PETSc to v3.7.6. See the PETSc documentation for a summary
of all of the changes.

* Switched to using CentOS 6.9 for Linux binary builds to insure
compatibility with glibc 2.12 and later.

----------------------------------------------------------------------
Version 2.2.0
----------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
AC_INIT([PyLith], [2.2.0], [cig-short@geodynamics.org])
AC_INIT([PyLith], [2.2.1], [cig-short@geodynamics.org])
AC_CONFIG_AUX_DIR([./aux-config])
AC_CONFIG_HEADER([portinfo])
AC_CONFIG_MACRO_DIR([m4])
Expand Down Expand Up @@ -213,7 +213,7 @@ AC_REQUIRE_CPP
AC_LANG(C++)
CIT_SPATIALDATA_HEADER
CIT_SPATIALDATA_LIB
CIT_PYTHON_MODULE([spatialdata],[1.9.8])
CIT_PYTHON_MODULE([spatialdata],[1.9.9])

# DOXYGEN
if test "$enable_documentation" = "yes" ; then
Expand Down Expand Up @@ -336,6 +336,7 @@ AC_CONFIG_FILES([Makefile
examples/3d/Makefile
examples/3d/tet4/Makefile
examples/3d/hex8/Makefile
examples/3d/subduction/Makefile
examples/2d/Makefile
examples/2d/subduction/Makefile
examples/2d/gravity/Makefile
Expand Down
7 changes: 4 additions & 3 deletions doc/developer/update_copyright.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash

for suffix in .cc .icc .hh .c .h .am .py .i .jou .odb .ac .in .dat .sh; do
for suffix in .cc .icc .hh .c .h .am .py .i .jou .odb .ac .in .dat; do
for f in `find . -name "*$suffix"` aclocal.m4 COPYING ; do
sed -e "s/Copyright (c) 2010-2015 University of California, Davis/Copyright (c) 2010-2017 University of California, Davis/g" $f > tmp && mv -f tmp $f
sed -e "s/Copyright (c) 2010-2016 University of California, Davis/Copyright (c) 2010-2017 University of California, Davis/g" $f > tmp && mv -f tmp $f
sed -e "s/Copyright (c) 2010-2017 University of California, Davis/Copyright (c) 2010-2017 University of California, Davis/g" $f > tmp && mv -f tmp $f
sed -e "s/Copyright (c) 2010-2017 University of California, Davis/Copyright (c) 2010-2017 University of California, Davis/g" $f > tmp && mv -f tmp $f
sed -e "s/Copyright (c) 2010-2017 University of California, Davis/Copyright (c) 2010-2017 University of California, Davis/g" $f > tmp && mv -f tmp $f
sed -e "s/Matthew G. Knepley, University of Chicago/Matthew G. Knepley, Rice University/g" $f > tmp && mv -f tmp $f
done
done
5 changes: 4 additions & 1 deletion doc/releasenotes/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ EXTRA_DIST = \
announce_v2.0.3.txt \
announce_v2.1.0.txt \
announce_v2.1.2.txt \
announce_v2.1.3.txt
announce_v2.1.3.txt \
announce_v2.1.4.txt \
announce_v2.2.0.txt \
announce_v2.2.1.txt


# End of file
72 changes: 72 additions & 0 deletions doc/releasenotes/announce_v2.2.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
Greetings,

I am pleased to announce the release of PyLith 2.2.1, a finite-element
code designed to solve dynamic elastic problems and quasi-static
viscoelastic problems in tectonic deformation.

This release provides a few new examples and bugfixes.

You can download the source code and binaries from

http://geodynamics.org/cig/software/pylith

Detailed installation instructions for the binary packages are in the
User Manual with detailed building instructions for a few platforms in
the INSTALL file bundled with the PyLith Installer utility. We also
offer a Docker image
(https://wiki.geodynamics.org/software:pylith:docker) for running
PyLith within a portable, virtual Linux environment.

======================================================================
MIGRATING FROM VERSION 2.1 TO 2.2
======================================================================

No changes are needed to parameter or other input files. The default
format for pylithinfo output is now JSON.

======================================================================
RELEASE NOTES
======================================================================

* Added new examples.

- examples/3d/subduction: New suite of examples for a 3-D
subduction zone. This intermediate level suite of examples
illustrates a wide range of PyLith features for quasi-static simulations.

- examples/2d/subduction: Added quasi-static spontaneous rupture
earthquake cycle examples (Steps 5 and 6) for slip-weakening and
rate- and state-friction.

- These new examples make use of ParaView Python scripts to
facilitate using ParaView with PyLith.

* Improved the PyLith manual

- Added diagram to guide users on which installation method best
meets their needs.

- Added instructions for how to use the Windows Subsystem for
Linux to install the PyLith Linux binary on systems running
Windows 10.

* Fixed bug in generating Xdmf files for 2-D vector output. Converted
Xdmf generator from C++ to Python for more robust generation of Xdmf
files from Python scripts.

* Updated spatialdata to v1.9.10. Improved error messages when reading
SimpleDB and SimpleGridDB files.

* Updated PyLith parameter viewer to v1.1.0. Application and
documentation are now available on line at
https://geodynamics.github.io/pylith_parameters. Small fix to insure
hierarchy path listed matches the one for PyLith.

* Updated PETSc to v3.7.6. See the PETSc documentation for a summary
of all of the changes.

* Switched to using CentOS 6.9 for Linux binary builds to insure
compatibility with glibc 2.12 and later.

See CHANGES in the top-level source directory for a list of changes
for each prior release.
Loading

0 comments on commit 348c811

Please sign in to comment.