Hans Petter Langtangen 9 lat temu
rodzic
commit
13c22af43a
2 zmienionych plików z 22 dodań i 18 usunięć
  1. 9 7
      README.do.txt
  2. 13 11
      README.md

+ 9 - 7
README.do.txt

@@ -41,7 +41,7 @@ FIGURE: [http://hplgit.github.io/bumpy/doc/src/mov-bumpy/m2_k1_5_b0_2/tmp_frame_
 ===== Tutorial =====
 
 For an introduction to Pysketcher, see the tutorial in "HTML": "http://hplgit.github.io/pysketcher/doc/pub/tutorial/pysketcher.html", "Sphinx": "http://hplgit.github.io/pysketcher/doc/pub/tutorial/html/index.html", or "PDF": "http://hplgit/github.io/pysketcher/doc/pub/tutorial/pysketcher.pdf" format (or a simplified version of
-the tutorial in Chapter 9 in "A Primer on Scientific Programming with Python": "http://www.amazon.com/Scientific-Programming-Computational-Science-Engineering/dp/3642549586/ref=sr_1_2?s=books&ie=UTF8&qid=1407225588&sr=1-2&keywords=langtangen", 4th edition, by H. P. Langtangen, Springer, 2014).
+the tutorial in Chapter 9 in "A Primer on Scientific Programming with Python": "http://www.amazon.com/Scientific-Programming-Computational-Science-Engineering/dp/3642549586/ref=sr_1_2?s=books&ie=UTF8&qid=1407225588&sr=1-2&keywords=langtangen", 4th-5th edition, by H. P. Langtangen, Springer, 2014-2016).
 
 ===== Examples =====
 
@@ -102,12 +102,12 @@ that has the original documentation of the tool.
 BibTeX format:
 
 !bc
-@book{Langtangen_2014,
+@book{Langtangen_Primer_2016,
   title = {A Primer on Scientific Programming With {P}ython},
   author = {H. P. Langtangen},
-  year = {2014},
+  year = {2016},
   publisher = {Springer},
-  edition = {Fourth},
+  edition = {Fifth},
 }
 
 @misc{Pysketcher,
@@ -116,6 +116,7 @@ BibTeX format:
   url = {https://github.com/hplgit/pysketcher},
   key = {Pysketcher},
   note = {\url{https://github.com/hplgit/pysketcher}},
+  year = 2016,
 }
 !ec
 
@@ -124,12 +125,12 @@ Publish format:
 !bc
 * books
 ** A Primer on Scientific Programming With {P}ython
-   key:       Langtangen_2014
+   key:       Langtangen_Primer_2016
    author:    H. P. Langtangen
-   year:      2014
+   year:      2016
    publisher: Springer
    status:    published
-   edition:   Fourth
+   edition:   Fifth
    entrytype: book
 * misc
 ** {P}ysketcher: {D}rawing tool for making sketches
@@ -139,6 +140,7 @@ Publish format:
    status:    published
    sortkey:   Pysketcher
    note:      \url{https://github.com/hplgit/pysketcher}
+   year:      2016
 !ec
 
 ===== History =====

+ 13 - 11
README.md

@@ -45,18 +45,18 @@ other objects in the vehicle. [View animation](http://hplgit.github.io/bumpy/doc
 ### Tutorial
 
 For an introduction to Pysketcher, see the tutorial in [HTML](http://hplgit.github.io/pysketcher/doc/pub/tutorial/pysketcher.html), [Sphinx](http://hplgit.github.io/pysketcher/doc/pub/tutorial/html/index.html), or [PDF](http://hplgit/github.io/pysketcher/doc/pub/tutorial/pysketcher.pdf) format (or a simplified version of
-the tutorial in Chapter 9 in [A Primer on Scientific Programming with Python](http://www.amazon.com/Scientific-Programming-Computational-Science-Engineering/dp/3642549586/ref=sr_1_2?s=books&ie=UTF8&qid=1407225588&sr=1-2&keywords=langtangen), 4th edition, by H. P. Langtangen, Springer, 2014).
+the tutorial in Chapter 9 in [A Primer on Scientific Programming with Python](http://www.amazon.com/Scientific-Programming-Computational-Science-Engineering/dp/3642549586/ref=sr_1_2?s=books&ie=UTF8&qid=1407225588&sr=1-2&keywords=langtangen), 4th-5th edition, by H. P. Langtangen, Springer, 2014-2016).
 
 ### Examples
 
 See the `examples` directory for some examples beyond the more basic
 ones in the tutorial.
-For example, a pendulum and its body diagram,
+For example, an elastic beam can be sketched as
 
-<!-- <img src="fig/pendulum2.png" width=800> -->
-![](fig/pendulum2.png)
+<!-- <img src="fig/beam2_3.png" width=600> -->
+![](fig/beam2_3.png)
 
-can be created by the program [`examples/pendulum.py`](https://github.com/hplgit/pysketcher/tree/master/examples/pendulum.py).
+The sketch was created by the program [`examples/beam2.py`](https://github.com/hplgit/pysketcher/tree/master/examples/beam2.py).
 
 Here is an illustration of the idea of numerical integration:
 
@@ -111,12 +111,12 @@ BibTeX format:
 
 
 ```
-@book{Langtangen_2014,
+@book{Langtangen_Primer_2016,
   title = {A Primer on Scientific Programming With {P}ython},
   author = {H. P. Langtangen},
-  year = {2014},
+  year = {2016},
   publisher = {Springer},
-  edition = {Fourth},
+  edition = {Fifth},
 }
 
 @misc{Pysketcher,
@@ -125,6 +125,7 @@ BibTeX format:
   url = {https://github.com/hplgit/pysketcher},
   key = {Pysketcher},
   note = {\url{https://github.com/hplgit/pysketcher}},
+  year = 2016,
 }
 ```
 
@@ -134,12 +135,12 @@ Publish format:
 ```
 * books
 ** A Primer on Scientific Programming With {P}ython
-   key:       Langtangen_2014
+   key:       Langtangen_Primer_2016
    author:    H. P. Langtangen
-   year:      2014
+   year:      2016
    publisher: Springer
    status:    published
-   edition:   Fourth
+   edition:   Fifth
    entrytype: book
 * misc
 ** {P}ysketcher: {D}rawing tool for making sketches
@@ -149,6 +150,7 @@ Publish format:
    status:    published
    sortkey:   Pysketcher
    note:      \url{https://github.com/hplgit/pysketcher}
+   year:      2016
 ```
 
 ### History