From c5c6c74d33753dda1629628cc4f5564898ac047d Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 22 Feb 2022 12:01:21 -0500 Subject: [PATCH] Fixed a bunch of typos --- examples/global-lunar-bombardment/ctem.in | 4 ++-- python/ctem/ctem/driver.py | 6 +++--- python/ctem/ctem/io.py | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in index 470aaee4..ca50a7fa 100755 --- 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 index 764759cc..061e8098 100644 --- 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 index 0b587234..92f5dc7a 100644 --- 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()