Fixed a bunch of typos

MintonGroup · Feb 22, 2022 · c5c6c74 · c5c6c74
1 parent cee9866
commit c5c6c74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
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/driver.py b/python/ctem/ctem/driver.py
@@ -91,7 +91,7 @@ def __init__(self, param_file="ctem.in"):
                 self.user['ncount'] = 1
 
                 # Write ctem.dat file
-                io.write_datfile(self.user, self.seedarr)
+                io.write_datfile(self.user, self.output_filenames['dat'], self.seedarr)
             else:
                 self.user['ncount'] = 0
 
@@ -212,10 +212,10 @@ def process_interval(self, isnew=True):
         self.pdist = io.read_formatted_ascii(self.output_filenames['pdist'], skip_lines=1)
 
         # Read impact mass from file
-        impact_mass = io.read_impact_mass(self.output_filenames['massfile'])
+        impact_mass = io.read_impact_mass(self.output_filenames['impmass'])
 
         # Read ctem.dat file
-        io.read_ctemdat(self.user, self.seedarr)
+        io.read_datfile(self.user, self.output_filenames['dat'], self.seedarr)
 
         # Save copy of crater distribution files
         if isnew:

diff --git a/python/ctem/ctem/io.py b/python/ctem/ctem/io.py
@@ -228,12 +228,11 @@ def image_shaded_relief(user, DEM):
     return user
 
 
-def read_datfile(user, seedarr):
+def read_datfile(user, datfile, seedarr):
     # Read and parse ctem.dat file
-    datfile = user['workingdir'] + 'ctem.dat'
 
     # Read ctem.dat file
-    print('Reading input file ' + user['datfile'])
+    print('Reading input file ' + datfile)
     fp = open(datfile, 'r')
     lines = fp.readlines()
     fp.close()