Merge branch 'PM' into 'master'

PM updated for fielddata See merge request caron/pyramid!13

Merge branch 'PM' into 'master'
3a8536a6 · Jan Caron · 9df761b4 · c3f95b80 · 9df761b4 · 3a8536a6
Commit 3a8536a6 authored 7 years ago by Jan Caron
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@ desktop.ini

 *.egg-info

-.DS_Store
+*.DS_Store

-.DS
+*.DS

-.ipynb_checkpoints*
+*.ipynb_checkpoints*
--- a/demos/Pyramid Notebook Example.ipynb
+++ b/demos/Pyramid Notebook Example.ipynb
--- a/demos/files/magdata.hdf5
+++ b/demos/files/magdata.hdf5
--- a/demos/files/phase.unf
+++ b/demos/files/phase.unf
--- a/demos/files/phasemap.hdf5
+++ b/demos/files/phasemap.hdf5
--- a/demos/images/activate.png
+++ b/demos/images/activate.png
--- a/demos/images/addsource.png
+++ b/demos/images/addsource.png
--- a/demos/images/environment.png
+++ b/demos/images/environment.png
--- a/demos/images/jutil-gitlab.png
+++ b/demos/images/jutil-gitlab.png
--- a/demos/images/phasemap-attributes.png
+++ b/demos/images/phasemap-attributes.png
--- a/demos/images/plot-field-params.png
+++ b/demos/images/plot-field-params.png
--- a/demos/images/plot-holo-params.png
+++ b/demos/images/plot-holo-params.png
--- a/demos/images/plot-phase-params.png
+++ b/demos/images/plot-phase-params.png
--- a/demos/images/plot-quiver-params.png
+++ b/demos/images/plot-quiver-params.png
--- a/demos/images/pm-params.png
+++ b/demos/images/pm-params.png
--- a/demos/images/pyramid-gitlab.png
+++ b/demos/images/pyramid-gitlab.png
--- a/demos/images/rec2d-params.png
+++ b/demos/images/rec2d-params.png
--- a/demos/images/vectordata-attributes.png
+++ b/demos/images/vectordata-attributes.png
--- a/pyramid/.DS_Store
+++ b/pyramid/.DS_Store