Merge pull request #536 from dynamicslab/trapping_extended

Trapping, extended to (a) enstrophy, and (b) local trapping
dynamicslab · Jul 31, 2024 · 889ac6d · 889ac6d
2 parents 476b59f + 94febf9
commit 889ac6d
Show file tree

Hide file tree

Showing 18 changed files with 7,756 additions and 218 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,7 @@
 
 # Interpret Jupyter notebooks as Python
 *.ipynb linguist-language=Python
+
+*.ipynb	diff=jupyternotebook
+
+*.ipynb	merge=jupyternotebook
diff --git a/examples/8_trapping_sindy_examples/.gitignore b/examples/8_trapping_sindy_examples/.gitignore
@@ -0,0 +1 @@
+*.pdf
diff --git a/examples/8_trapping_sindy_examples/dysts_examples.ipynb b/examples/8_trapping_sindy_examples/dysts_examples.ipynb