Merge pull request #21 from ubermag/metadata-update

metadata-update
ubermag · Sep 27, 2021 · 38e254b · 38e254b
2 parents 0ce4928 + 9024db5
commit 38e254b
Show file tree

Hide file tree

Showing 22 changed files with 944 additions and 1,162 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@
 .#*
 *#
 .DS_Store
-docs/ipynb/*
-!docs/ipynb/*.ipynb
+docs/*
+!docs/*.ipynb
 docs/_build
 .cache
 .coverage

diff --git a/.readthedocs.yml b/.readthedocs.yml
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 PROJECT=ubermagtable
-IPYNBPATH=docs/ipynb/*.ipynb
+IPYNBPATH=docs/*.ipynb
 PYTHON?=python
 
 test-unittests:

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 | Coverage | [![codecov](https://codecov.io/gh/ubermag/ubermagtable/branch/master/graph/badge.svg?token=hcK4fofmrL)](https://codecov.io/gh/ubermag/ubermagtable) |
 | Documentation | [![Documentation](https://img.shields.io/badge/Docs-ubermag.github.io-blue)](https://ubermag.github.io/documentation/ubermagtable.html) |
 | YouTube | [![YouTube](https://img.shields.io/badge/YouTube-ubermag-blue)](https://www.youtube.com/channel/UC7MSqVQSMFV42R1jAYmKGLg) |
-| Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ubermag/ubermagtable/stable?urlpath=lab/tree/docs/ipynb/index.ipynb)|
+| Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ubermag/ubermagtable/stable?urlpath=lab/tree/docs/index.ipynb) |
 | Platforms | [![Platforms](https://anaconda.org/conda-forge/ubermagtable/badges/platforms.svg)](https://anaconda.org/conda-forge/ubermagtable) |
 | Downloads | [![Downloads](https://anaconda.org/conda-forge/ubermagtable/badges/downloads.svg)](https://anaconda.org/conda-forge/ubermagtable) |
 | License | [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) |

diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_templates/class-template.rst b/docs/_templates/class-template.rst
diff --git a/docs/_templates/module-template.rst b/docs/_templates/module-template.rst
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/docs/ipynb/index.ipynb → docs/index.ipynb b/docs/ipynb/index.ipynb → docs/index.ipynb
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/ipynb/installation-testing-update.ipynb → docs/installation-testing-update.ipynb b/docs/ipynb/installation-testing-update.ipynb → docs/installation-testing-update.ipynb
diff --git a/docs/ipynb/table-interactive-plot.ipynb b/docs/ipynb/table-interactive-plot.ipynb
diff --git a/docs/ipynb/table-visualisation.ipynb b/docs/ipynb/table-visualisation.ipynb
diff --git a/docs/ipynb/macrospin/drive-0/macrospin.odt → docs/macrospin/drive-0/macrospin.odt b/docs/ipynb/macrospin/drive-0/macrospin.odt → docs/macrospin/drive-0/macrospin.odt
@@ -1,6 +1,6 @@
 # ODT 1.0
 # Table Start
-# Title: mmArchive Data Table, Wed Sep 15 09:54:25 CEST 2021
+# Title: mmArchive Data Table, Mon Sep 27 17:16:54 CEST 2021
 # Columns: {Oxs_RungeKuttaEvolve:evolver:Total energy} {Oxs_RungeKuttaEvolve:evolver:Energy calc count} {Oxs_RungeKuttaEvolve:evolver:Max dm/dt} Oxs_RungeKuttaEvolve:evolver:dE/dt {Oxs_RungeKuttaEvolve:evolver:Delta E} Oxs_FixedZeeman:zeeman:Energy Oxs_TimeDriver::Iteration {Oxs_TimeDriver::Stage iteration} Oxs_TimeDriver::Stage Oxs_TimeDriver::mx   Oxs_TimeDriver::my   Oxs_TimeDriver::mz   {Oxs_TimeDriver::Last time step} {Oxs_TimeDriver::Simulation time}
 # Units:                        J                                             {}                                         deg/ns                                 J/s                                   J                                  J                          {}                            {}                          {}                   {}                   {}                   {}                          s                                 s                
                       -4.4007616478200001e-22                            37                                           25204.415522200001                   -8.7987120542e-10                    -3.26961235137e-22                -4.4007616478200001e-22         6                             6                           0                     0.975900701403       0.21711461093600001  0.0218875928006            3.7150172413700002e-13              4.9999999999999999e-13       

diff --git a/docs/ipynb/other.ipynb → docs/other.ipynb b/docs/ipynb/other.ipynb → docs/other.ipynb
diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/docs/ipynb/table-basics.ipynb → docs/table-basics.ipynb b/docs/ipynb/table-basics.ipynb → docs/table-basics.ipynb
@@ -21,7 +21,7 @@
     "import ubermagtable as ut\n",
     "\n",
     "# Sample OOMMF .odt file\n",
-    "dirname = os.path.join('..', '..', 'ubermagtable', 'tests', 'test_sample')\n",
+    "dirname = os.path.join('..', 'ubermagtable', 'tests', 'test_sample')\n",
     "odtfile = os.path.join(dirname, 'oommf-new-file2.odt')\n",
     "\n",
     "table = ut.Table.fromfile(odtfile)"
@@ -1166,7 +1166,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1180,7 +1180,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {

diff --git a/docs/ipynb/table-fft.ipynb → docs/table-fft.ipynb b/docs/ipynb/table-fft.ipynb → docs/table-fft.ipynb
diff --git a/docs/table-interactive-plot.ipynb b/docs/table-interactive-plot.ipynb
diff --git a/docs/ipynb/table-merge.ipynb → docs/table-merge.ipynb b/docs/ipynb/table-merge.ipynb → docs/table-merge.ipynb
@@ -23,7 +23,7 @@
     "import ubermagtable as ut\n",
     "\n",
     "# Sample .odt file\n",
-    "dirname = os.path.join('..', '..', 'ubermagtable', 'tests', 'test_sample')\n",
+    "dirname = os.path.join('..', 'ubermagtable', 'tests', 'test_sample')\n",
     "odtfile1 = os.path.join(dirname, 'oommf-old-file1.odt')\n",
     "odtfile2 = os.path.join(dirname, 'oommf-old-file2.odt')\n",
     "\n",
@@ -198,7 +198,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -212,7 +212,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {

diff --git a/docs/table-visualisation.ipynb b/docs/table-visualisation.ipynb