From 41b9a737969acfe09c093ed37ba0b96349dcd309 Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Wed, 3 Oct 2012 17:15:31 -0400 Subject: [PATCH] Change division name from "Metallurgy" to "Materials Science and Engineering" --- README.txt | 15 ++++++++------- documentation/CREDITS.txt | 12 +++++++----- documentation/_templates/index.html | 4 ++-- documentation/_themes/nist/contact.html | 4 ++-- documentation/conf.py | 2 +- fipy/__init__.py | 12 ++++++------ setup.py | 2 +- 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/README.txt b/README.txt index ed1fa20656..4259fcc9e0 100644 --- a/README.txt +++ b/README.txt @@ -4,12 +4,13 @@ Overview .. only:: latex - :term:`FiPy` is an object oriented, partial differential equation (PDE) solver, - written in :term:`Python`, based on a standard finite volume (FV) - approach. The framework has been developed in the `Metallurgy Division`_ - and Center for Theoretical and Computational Materials Science (CTCMS_), in - the Material Measurement Laboratory (MML_) at the National - Institute of Standards and Technology (NIST_). + :term:`FiPy` is an object oriented, partial differential equation (PDE) + solver, written in :term:`Python`, based on a standard finite volume + (FV) approach. The framework has been developed in the Materials Science + and Engineering Division (MSED_) and Center for Theoretical and + Computational Materials Science (CTCMS_), in the Material Measurement + Laboratory (MML_) at the National Institute of Standards and Technology + (NIST_). The solution of coupled sets of PDEs is ubiquitous to the numerical simulation of science problems. Numerous PDE solvers exist, using a @@ -249,7 +250,7 @@ or a .. _MML: http://www.nist.gov/mml/ .. _CTCMS: http://www.ctcms.nist.gov/ -.. _Metallurgy Division: http://www.nist.gov/mml/metallurgy/ +.. _MSED: http://www.nist.gov/mml/msed/ .. _NIST: http://www.nist.gov/ .. _Subversion: http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://matforge.org/fipy/browser .. _compressed archive: http://www.ctcms.nist.gov/fipy/download/FiPy-1.1.tar.gz diff --git a/documentation/CREDITS.txt b/documentation/CREDITS.txt index 44561cce0e..4c672a6972 100644 --- a/documentation/CREDITS.txt +++ b/documentation/CREDITS.txt @@ -3,17 +3,18 @@ Contributors ============ `Jon Guyer`_ - is a member of the research staff of the `Metallurgy Division`_ in + is a member of the research staff of |MSED| in |MML| at |NIST|. Jon's computational interests are in object-oriented design and in phase field modeling of electrochemistry. `Daniel Wheeler`_ - is a caveman. Daniel's interests are in numerical modeling, finite + is a guest researcher in |MSED| in + |MML| at |NIST|. Daniel's interests are in numerical modeling, finite volume techniques, and level set treatments. `Jim Warren`_ - is the group leader of the Themodynamics and Kinetics group in the - `Metallurgy Division`_ and Director of |CTCMS| of |MML| at + is the leader of the Themodynamics and Kinetics group in + |MSED| and Director of |CTCMS| of |MML| at |NIST|. Jim is interested in a variety of problems, including the phase field modeling of solidification, polycrystalline solids, and the electrochemical interface. @@ -50,13 +51,14 @@ James O'Beirne deployment of a :term:`Buildbot` server to automate :term:`FiPy` testing and a full refactor of the ``Mesh`` classes. +.. |MSED| replace:: the `Materials Science and Engineering Division`_ .. |MML| replace:: the `Material Measurement Laboratory`_ .. |CTCMS| replace:: the `Center for Theoretical and Computational Materials Science`_ .. |NIST| replace:: the `National Institute of Standards and Technology`_ .. _Material Measurement Laboratory: http://www.nist.gov/mml/ .. _Center for Theoretical and Computational Materials Science: http://www.ctcms.nist.gov/ -.. _Metallurgy Division: http://www.nist.gov/mml/metallurgy/ +.. _Materials Science and Engineering Division: http://www.nist.gov/mml/msed/ .. _National Institute of Standards and Technology: http://www.nist.gov/ .. _SURF: http://www.surf.nist.gov/surf2.htm diff --git a/documentation/_templates/index.html b/documentation/_templates/index.html index 5613ffcb65..b3395b9d91 100644 --- a/documentation/_templates/index.html +++ b/documentation/_templates/index.html @@ -8,8 +8,8 @@

FiPy: A Finite Volume PDE Solver Using Python

written in Python, based on a standard finite volume (FV) approach. The framework has been - developed in the Metallurgy Division and Center + developed in the Materials Science and Engineering Division (MSED) and Center for Theoretical and Computational Materials Science (CTCMS), in the Material Measurement Laboratory (Contact

FiPy developers
Jonathan Guyer
Daniel Wheeler
James Warren

diff --git a/documentation/conf.py b/documentation/conf.py index c9424b8cdb..3cfd4dc1d6 100644 --- a/documentation/conf.py +++ b/documentation/conf.py @@ -279,7 +279,7 @@ \definecolor{redish}{rgb}{0.894,0.122,0.122} \definecolor{bluish}{rgb}{0.216,0.188,0.533} - \authoraddress{Metallurgy Division \\ + \authoraddress{Materials Science and Engineering Division \\ and the Center for Theoretical and Computational Materials Science \\ Material Measurement Laboratory} diff --git a/fipy/__init__.py b/fipy/__init__.py index d1935d1bd6..fd655e16f7 100644 --- a/fipy/__init__.py +++ b/fipy/__init__.py @@ -1,10 +1,10 @@ """ :term:`FiPy` is an object oriented, partial differential equation (PDE) solver, -written in :term:`Python`, based on a standard finite volume (FV) -approach. The framework has been developed in the `Metallurgy Division`_ -and Center for Theoretical and Computational Materials Science (CTCMS_), in -the Material Measurement Laboratory (MML_) at the National -Institute of Standards and Technology (NIST_). +written in :term:`Python`, based on a standard finite volume (FV) approach. The +framework has been developed in the Materials Science and Engineering Division +(MSED_) and Center for Theoretical and Computational Materials Science (CTCMS_), +in the Material Measurement Laboratory (MML_) at the National Institute of +Standards and Technology (NIST_). The solution of coupled sets of PDEs is ubiquitous to the numerical simulation of science problems. Numerous PDE solvers exist, using a @@ -25,7 +25,7 @@ .. _MML: http://www.nist.gov/mml/ .. _CTCMS: http://www.ctcms.nist.gov/ -.. _Metallurgy Division: http://www.metallurgy.nist.gov/ +.. _MSED: http://www.nist.gov/mml/msed/ .. _NIST: http://www.nist.gov/ """ __docformat__ = 'restructuredtext' diff --git a/setup.py b/setup.py index 52e8c38209..b6f01edf35 100644 --- a/setup.py +++ b/setup.py @@ -261,7 +261,7 @@ def getVersion(version, release=False): return version dist = setup( name = "FiPy", - version = getVersion(version='3.0', release=False), + version = getVersion(version='3.0.1', release=True), author = "Jonathan Guyer, Daniel Wheeler, & Jim Warren", author_email = "fipy@nist.gov", url = "http://www.ctcms.nist.gov/fipy/",