Fixed some array allocation bugs and made new test environment for gl…

…obal realistic bombardment
MintonGroup · Nov 1, 2021 · 5456394 · 5456394
1 parent a0fe831
commit 5456394
Show file tree

Hide file tree

Showing 76 changed files with 15,536 additions and 204 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,6 @@ build/src/CTEM
 *.swp
 
 
-build/
-
 configure
 
 config/

diff --git a/examples/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in
@@ -10,14 +10,11 @@ testxoffset  0.0                             ! x-axis offset of crater center fr
 testyoffset  0.0                            ! y-axis offset of crater center from grid center (m) - Default 0.0
 tallyonly    F                                 ! Tally the craters without generating any craters
 testtally    F   
-quasimc      T                                 ! MC run constrained by non-MC 'real' craters given in a list
-realcraterlist    craterlist.in                ! list of 'real' craters for Quasi-MC runs
-
 
 
 ! IDL driver in uts
-interval     6.280 
-numintervals 100                                  ! Total number of intervals (total time = interval * numintervals) <--when runtype is 'single'
+interval     628 
+numintervals 1                                  ! Total number of intervals (total time = interval * numintervals) <--when runtype is 'single'
 restart      F                                  ! Restart a previous run
 impfile      NPFextrap.dat          ! Impactor SFD rate file (col 1: Dimp (m), col 2: ! impactors > D (m**(-2) y**(-1))
 popupconsole F                                  ! Pop up console window every output interval 
@@ -69,7 +66,7 @@ doangle         T                               ! Vary the impact angle. Set to
 Kd1             0.0001
 psi             2.000
 fe              4.00
-ejecta_truncation 4.0
-dorays  T 
+ejecta_truncation 10.0
+dorays  F 
 superdomain F
-
+dorealistic F
diff --git a/examples/global-lunar-bombardment/ctem_driver.py b/examples/global-lunar-bombardment/ctem_driver.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python3
 #
 #Cratered Terrain Evolution Model driver
 #
@@ -224,4 +224,4 @@
 
 #Close updateable fracdonefile and regodepthfile files
 fp_frac.close()
-fp_reg.close()
+fp_reg.close()
diff --git a/examples/global-lunar-bombardment/params.txt b/examples/global-lunar-bombardment/params.txt
@@ -0,0 +1,4 @@
+5
+6.0
+4.0
+
diff --git a/examples/morphology_test_cases/complex/CTEM b/examples/morphology_test_cases/complex/CTEM
@@ -1 +1 @@
-../../../build/src/CTEM
+/home/daminton/git/CTEM/build/src/CTEM
diff --git a/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc
diff --git a/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc
diff --git a/examples/morphology_test_cases/complex/ctem_draw_surf.py b/examples/morphology_test_cases/complex/ctem_draw_surf.py
@@ -0,0 +1 @@
+../../../python/ctem_draw_surf.py
diff --git a/examples/morphology_test_cases/complex/params.txt b/examples/morphology_test_cases/complex/params.txt
@@ -0,0 +1,4 @@
+5
+6.0
+4.0
+
diff --git a/examples/morphology_test_cases/complex/reset.sh b/examples/morphology_test_cases/complex/reset.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+rsync -va savestate/* .
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,6 @@ build/src/CTEM @@
     *.swp
-    build/
     configure
     config/
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../../build/src/CTEM
		/home/daminton/git/CTEM/build/src/CTEM