Merge branch 'visualize3d' into realistic

MintonGroup · Feb 23, 2022 · fc8fc40 · fc8fc40
2 parents e7c6208 + ed8cac8
commit fc8fc40
Show file tree

Hide file tree

Showing 15 changed files with 855 additions and 835 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,5 @@ examples/global-lunar-bombardment/scale.ipynb
 *.code-workspace
 
 *.png
+
+python/ctem/ctem.egg-info/
diff --git a/examples/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in
@@ -34,9 +34,9 @@ runtype      single                             ! Run type: options are normal /
 
 ! CTEM required inputs
 seed         76535                    ! Random number generator seed
-gridsize     2000                          ! Size of grid in pixels
+gridsize     200                          ! Size of grid in pixels
 numlayers    10                                 ! Number of perched layers
-pix          3.08e3                           ! Pixel size (m)
+pix          3.08e4                           ! Pixel size (m)
 mat          rock                               ! Material (rock or ice)
 ! Bedrock scaling parameters
 mu_b         0.55e0                             ! Experimentally derived parameter for bedrock crater scaling law 

diff --git a/python/ctem/ctem/__init__.py b/python/ctem/ctem/__init__.py
@@ -1,3 +1,4 @@
 # from ctem.ctem_io_readers import *
 # from ctem.ctem_io_writers import *
 # from ctem.ctem_driver import *
+from ctem.driver import *
diff --git a/python/ctem/ctem/ctem_draw_surf.py b/python/ctem/ctem/ctem_draw_surf.py
diff --git a/python/ctem/ctem/ctem_driver.py b/python/ctem/ctem/ctem_driver.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,3 +69,5 @@ examples/global-lunar-bombardment/scale.ipynb
		*.code-workspace

		*.png

		python/ctem/ctem.egg-info/