From 775823ed8f4275195ac050a806c913f2dd670b48 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 6 Jun 2006 17:37:12 +0000 Subject: [PATCH 1/6] Adjusted the tolerance from 6e-2 to 7e-2 to fox test case as different versions of gmsh produce different meshes e.g. version 1.60.1 makes 2550 cells, while version 1.63.2 makes 2626 cells. git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1839 d80e17d7-ff13-0410-a124-85740d801063 --- examples/diffusion/circle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/diffusion/circle.py b/examples/diffusion/circle.py index 8f5efe43d2..eef04fb687 100755 --- a/examples/diffusion/circle.py +++ b/examples/diffusion/circle.py @@ -260,7 +260,7 @@ ... print "The SciPy library is not available to test the solution to \ ... the transient diffusion equation" - >>> print phi.allclose(phiAnalytical, atol = 6e-2) + >>> print phi.allclose(phiAnalytical, atol = 7e-2) 1 >>> if __name__ == '__main__': From 95f5443e0a774d47452bfe8946e50406909d288f Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 6 Jun 2006 17:38:40 +0000 Subject: [PATCH 2/6] Fixed broken tests with arc* funcs by adding ValueError as another exception possibility. git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1840 d80e17d7-ff13-0410-a124-85740d801063 --- fipy/tools/numerix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fipy/tools/numerix.py b/fipy/tools/numerix.py index a313fb8c72..c68743394d 100644 --- a/fipy/tools/numerix.py +++ b/fipy/tools/numerix.py @@ -242,7 +242,7 @@ def arccos(arr): >>> try: ... print str(arccos(2.0)) == "nan" - ... except OverflowError: + ... except (OverflowError, ValueError): ... print 1 1 @@ -287,7 +287,7 @@ def arccosh(arr): >>> try: ... print str(arccosh(0.0)) == "nan" - ... except OverflowError: + ... except (OverflowError, ValueError): ... print 1 1 @@ -324,7 +324,7 @@ def arcsin(arr): >>> try: ... print str(arcsin(2.0)) == "nan" - ... except OverflowError: + ... except (OverflowError, ValueError): ... print 1 1 From 9b0527ae886822439b6eaca5ed6ed0e0a71106f1 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Tue, 6 Jun 2006 18:37:51 +0000 Subject: [PATCH 3/6] Tweaking the documentation. git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1841 d80e17d7-ff13-0410-a124-85740d801063 --- INSTALLATION.txt | 23 ++++++++++++++++++++--- README.txt | 4 ++++ documentation/ADMINISTRATA.txt | 4 ++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/INSTALLATION.txt b/INSTALLATION.txt index 66d27aad09..c7ab98d804 100644 --- a/INSTALLATION.txt +++ b/INSTALLATION.txt @@ -2,6 +2,14 @@ Installation ============ +.. contents:: + :local: + :depth: 2 + +.. raw:: latex + + \minitoc[e] + The |FiPy| finite volume PDE solver relies on several third-party packages. It is *best to obtain and install those first*, before attempting to install |FiPy|. @@ -306,7 +314,7 @@ common platforms. .. warning:: The facility to produce hard copies in Pygist_ does not work very well and - may crash the |FiPy| run. "``.eps''" and "``.cgm''" export seem to work. + may crash the |FiPy| run. "``.eps``" and "``.cgm``" export seem to work. .. attention:: @@ -392,11 +400,20 @@ judicious use of C language inlining, via the weave_ module of the SciPy_ package. `SciPy installers for specific platforms`_ |citeSciPyDownload| are available. -In addition, a handful of test cases use functions from the SciPy_ library. +.. attention:: + + SciPy_ is undergoing a lot of development lately but, as yet, |FiPy| still + requires "old SciPy". Be sure to install version 0.3.x of + ``SciPy_complete``. + +.. note:: + + A handful of test cases use functions from the SciPy_ library and will + throw errors if it is missing. .. _weave: http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://www.scipy.org/documentation/weave/ .. _SciPy: http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://www.scipy.org/ -.. _SciPy installers for specific platforms: http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://www.scipy.org/download/ +.. _SciPy installers for specific platforms: http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://sourceforge.net/project/showfiles.php?group_id=27747&package_id=19531&release_id=389739 .. |citeSciPyDownload| raw:: latex \cite{SciPyDownload} diff --git a/README.txt b/README.txt index 3011bf2fd8..f414113225 100644 --- a/README.txt +++ b/README.txt @@ -89,6 +89,10 @@ The significant changes since version 1.0 are: - Added a `MultiViewer` class that automatically groups several viewers together if the variables couldn't be displayed by a single viewer. +- The abbreviated syntax ``from fipy import Class`` or ``from fipy import *`` + promised in version 1.0 actually works now. The examples all still use the + fully qualified names. + - The repository has been converted from a CVS to a Subversion_ repository. Details on how to check out the new repository are given in the |INSTALLATION-txt|. diff --git a/documentation/ADMINISTRATA.txt b/documentation/ADMINISTRATA.txt index c8fd2ce245..8acf992655 100644 --- a/documentation/ADMINISTRATA.txt +++ b/documentation/ADMINISTRATA.txt @@ -68,9 +68,9 @@ At point of version release x.y, *on main trunk*:: $ svn copy $FIPYROOT/trunk $FIPYROOT/tags/version-x_y -m "tagging version x.y" $ svn delete $FIPYROOT/tags/STABLE -m "moving STABLE to new version" - $ svn copy $FIPYROOT/tags/version-x_y $FIPYROOT/tags/STABLE -m "tagging STABLE" + $ svn copy $FIPYROOT/tags/version-x_y $FIPYROOT/tags/STABLE -m "version x.y is STABLE" $ svn delete $FIPYROOT/tags/CURRENT -m "moving CURRENT to new version" - $ svn copy $FIPYROOT/tags/version-x_y $FIPYROOT/tags/CURRENT -m "tagging CURRENT" + $ svn copy $FIPYROOT/tags/version-x_y $FIPYROOT/tags/CURRENT -m "version x.y is CURRENT" --------- Bug fixes From 857d5f2886a82689f798eb1603d6000c07565eb2 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Tue, 6 Jun 2006 19:44:19 +0000 Subject: [PATCH 4/6] documentation tweaks git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1842 d80e17d7-ff13-0410-a124-85740d801063 --- documentation/CREDITS.txt | 2 +- documentation/manual/refs.bib | 9 ++++++++- documentation/www/menu.html | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/documentation/CREDITS.txt b/documentation/CREDITS.txt index 3a1c5da1a7..9e98542a4a 100644 --- a/documentation/CREDITS.txt +++ b/documentation/CREDITS.txt @@ -1,5 +1,5 @@ ============ -CONTRIBUTORS +Contributors ============ `Jon Guyer`_ diff --git a/documentation/manual/refs.bib b/documentation/manual/refs.bib index 65ef863e98..e2760802d2 100644 --- a/documentation/manual/refs.bib +++ b/documentation/manual/refs.bib @@ -259,14 +259,17 @@ @manual{FiPyGuide } @misc{FiPyMailingList, + note = {\FiPy{} mailing list}, url = {http://www.ctcms.nist.gov/fipy/mail.html} } @misc{FiPyBugTracker, + note = {\FiPy{} bug tracker}, url = {http://matdl-osi.org/fipy/report} } @misc{FiPyDownload, + note = {\FiPy{} download page}, url = {http://www.ctcms.nist.gov/fipy/download/} } @@ -279,16 +282,20 @@ @misc{EnthonMacOSX } @misc{PythonDownload, + note = {Python download page}, url = {http://www.python.org/download/} } @misc{MatplotlibDownload, + note = {Matplotlib download page}, url = {http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=82474} } @misc{SciPyDownload, - url = {http://www.scipy.org/download/} + note = {SciPy download page}, + url = {http://sourceforge.net/project/showfiles.php?group_id=27747&package_id=19531&release_id=389739} } +% url = {http://www.scipy.org/download/} @misc{SubversionRedBean, url = {http://svnbook.red-bean.com} diff --git a/documentation/www/menu.html b/documentation/www/menu.html index f122d7af24..5e994c0fca 100644 --- a/documentation/www/menu.html +++ b/documentation/www/menu.html @@ -10,6 +10,10 @@
  • Manual (PDF)
  • Reference (PDF)
  • Wiki
    • +
  • Source code
    • +
  • Bugs, etc.
  • Superconformal electrodeposition
    • From 35354de4919f783769020f566c73d9e188adca6c Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 6 Jun 2006 20:26:03 +0000 Subject: [PATCH 5/6] Reverted back to previous version of Enthought Python as required dll is missing for all python23 versions git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1843 d80e17d7-ff13-0410-a124-85740d801063 --- WINDOWS-INSTALLATION.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/WINDOWS-INSTALLATION.txt b/WINDOWS-INSTALLATION.txt index 5d525f2eb1..c6462a3fbd 100644 --- a/WINDOWS-INSTALLATION.txt +++ b/WINDOWS-INSTALLATION.txt @@ -25,13 +25,18 @@ experience to have a usable installation up and running. Step 1: Install Python ---------------------- -http://code.enthought.com/enthon/ +http://download.enthought.com/enthought_python-2.3.5-1076-wx26-n238.exe -Download version 1.0.0 and run the installer. Open the +Download and run the Enthought Edition installer. Open the ``C:\Python23\Lib\site-packages\vtk_python\`` directory in a browser and move ``vtkRenderingPythonTkWidgets.dll`` to the ``C:\Python23\`` directory. +.. warning: + + Don't download later versions of Enthought Python, they may + be missing ``vtkRenderingPythonTkWidgets.dll``. + Step 2: Install PyVTK --------------------- @@ -55,7 +60,14 @@ Download and unpack the zip file. Run the |FiPy| installer ``FiPy-1.1.win32.exe``, which should be in the base FiPy-1.1 directory. -Step 5: Install Gmsh +Step 5: Install Matplotlib +-------------------------- + +http://prdownloads.sourceforge.net/matplotlib/matplotlib-0.87.2.win32-py2.3.exe?download + +Download and run the Matplotlib installer. + +Step 6: Install Gmsh -------------------- http://www.geuz.org/gmsh/bin/Windows/gmsh-1.65.0-Windows.zip @@ -63,7 +75,7 @@ http://www.geuz.org/gmsh/bin/Windows/gmsh-1.65.0-Windows.zip Download and unpack Gmsh for Windows. Open the unpacked folder with a browser and copy the ``gmsh.exe`` file to ``C:\Python23``. -Step 6: Run IDLE_ +Step 7: Run IDLE_ ----------------- The IDLE_ environment is recommended for running |FiPy|. In order to @@ -80,7 +92,7 @@ instructions: - Add the ``-n`` option to ``Target`` being sure to leave a space after the last quote and before ``-n`` - Drag and drop ``IDLE (Python GUI)(2)`` to the desktop to create an icon. -Step 7: Import a module and view the results +Step 8: Import a module and view the results -------------------------------------------- You can use the IDLE_ file browser to open the examples and run the From 456be144003c77df7f0ad64c508ed9b6035a1699 Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Tue, 6 Jun 2006 20:52:59 +0000 Subject: [PATCH 6/6] Updating bibliographic info git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1844 d80e17d7-ff13-0410-a124-85740d801063 --- documentation/manual/refs.bib | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/documentation/manual/refs.bib b/documentation/manual/refs.bib index e2760802d2..11eaf15756 100644 --- a/documentation/manual/refs.bib +++ b/documentation/manual/refs.bib @@ -274,11 +274,13 @@ @misc{FiPyDownload } @misc{EnthonWindows, + note = {Enthought Edition of Python for Windows and Linux}, url = {https://www.enthought.com/python/} } @misc{EnthonMacOSX, - url = {http://www.scipy.org/wikis/featurerequests/MacEnthon} + note = {Enthought Edition of Python for Mac OS X}, + url = {http://old.scipy.org/wikis/featurerequests/MacEnthon} } @misc{PythonDownload, @@ -297,10 +299,13 @@ @misc{SciPyDownload } % url = {http://www.scipy.org/download/} -@misc{SubversionRedBean, +@book{SubversionRedBean, + author = {Ben Collins-Sussman and Brian W. Fitzpatrick and C. Michael Pilato}, + title = {Version Control with Subversion}, + publisher = {O'Reilly Media}, + year = 2004, url = {http://svnbook.red-bean.com} } - @misc{SourceForgeCVS, url = {http://sourceforge.net/cvs/?group_id=118428} }