Merge branch 'main' into 17_refactor_meshgen

mesh-adaptation · Nov 14, 2024 · c1cf475 · c1cf475
2 parents f34054e + a940047
commit c1cf475
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 19,693 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,15 @@
-**/.DS_Store
-**/__pycache__/*
-
-warpmesh.egg-info/*
-.eggs/*
-data/few*
-data/dataset*
-data/dataset/*
-data/helmholtz*
-data/output/*
-data/temp/*
-data/z*
-data/burgers*
-data/dataset/burgers*
-wandb/*
-
-install/movement/*
-install/firedrake/*
-install/firedrake-install.log
-install/firedrake-install
-
-script/git_push.sh
-script/check_tangle.ipynb
-script/compare_error.ipynb
-scirpt/play_tangle.ipynb
-
-eval/*
-
+# Subdirectories
+__pycache__/
+UM2N.egg-info/
+.eggs/
+data/
+results/
+.ipynb_checkpoints/
+.vscode/
+
+# Specific files
+.gitconfig
 .gitmodules
 
-temp/*
-results/*
-
-temp*
-
-
+# File extensions
+*.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/UM2N/test/__init__.py b/UM2N/test/__init__.py
@@ -1,6 +1,5 @@
 from .tangle import *  # noqa
 from .compare_hlmhltz import *  # noqa
-from .bench_helmholtz import *  # noqa
 from .bench_swirl import *  # noqa
 from .bench_burgers import *  # noqa
 from .stat import *  # noqa
diff --git a/UM2N/test/bench_helmholtz.py b/UM2N/test/bench_helmholtz.py
diff --git a/UM2N/test/burgers_bench.py b/UM2N/test/burgers_bench.py
diff --git a/UM2N/test/tangle.py b/UM2N/test/tangle.py
@@ -13,10 +13,6 @@
 __all__ = ["check_dataset_tangle", "plot_prediction", "plot_sample"]
 
 
-def check_tangle_pi(model, x):
-    pass
-
-
 def check_dataset_tangle(
     dataset,
     model,

diff --git a/meshes/Makefile b/meshes/Makefile
@@ -0,0 +1,5 @@
+all: plate_015
+
+# Generate plate_015.msh based on plate_015.geo geometry file
+plate_015:
+	gmsh -2 plate_015.geo
diff --git a/meshes/plate_015.geo.txt → meshes/plate_015.geo b/meshes/plate_015.geo.txt → meshes/plate_015.geo