Merge branch 'debugGlassMerge'

MintonGroup · Dec 10, 2021 · 4e930c5 · 4e930c5
2 parents 6fe3ce8 + cc0053d
commit 4e930c5
Show file tree

Hide file tree

Showing 241 changed files with 1,030,392 additions and 17,059 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 
-autom4te.cache/
+autom4te.cache/output.*
+autom4te.cache/traces.*
+autom4te.cache/requests
+Makefile.in
 
 *.o
 
+
 build/src/CTEM
 
 *.mod
@@ -24,8 +28,6 @@ __pycache__/
 
 *.dat
 
-*.png
-
 *.DS_Store
 
 *.json
@@ -41,3 +43,27 @@ examples/global-lunar-bombardment/CTEM
 !LOLA*.dat
 !lunar*.dat
 !NPF*.dat
+alocal.m4
+
+*.m4
+
+*.eps
+examples/mare-with-rays-model2/CTEM
+
+
+examples/global-lunar-bombardment/CTEM
+
+
+examples/*/*.o*
+*.out
+
+!autogen.sh
+*.sh
+.vscode/*
+
+
+examples/global-lunar-bombardment/scale.ipynb
+*~
+
+*.m4
+*.code-workspace