Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed more typos.
  • Loading branch information
daminton committed Feb 22, 2022
1 parent c5c6c74 commit 7557f79
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions python/ctem/ctem/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,22 +218,21 @@ def process_interval(self, isnew=True):
io.read_datfile(self.user, self.output_filenames['dat'], self.seedarr)

# Save copy of crater distribution files
# Update user: mass, curyear, regolith properties
self.user['masstot'] = self.user['masstot'] + impact_mass

self.user['curyear'] = self.user['curyear'] + self.user['fracdone'] * self.user['interval']
template = "%(fracdone)9.6f %(curyear)19.12E\n"
with open(self.output_filenames['fracdone'], 'w') as fp_frac:
fp_frac.write(template % self.user)

reg_text = "%19.12E %19.12E %19.12E %19.12E\n" % (self.user['curyear'],
np.mean(self.surface_ejc), np.amax(self.surface_ejc),
np.amin(self.surface_ejc))
with open(self.output_filenames['regodepth'], 'w') as fp_reg:
fp_reg.write(reg_text)

if isnew:

# Update user: mass, curyear, regolith properties
self.user['masstot'] = self.user['masstot'] + impact_mass

self.user['curyear'] = self.user['curyear'] + self.user['fracdone'] * self.user['interval']
template = "%(fracdone)9.6f %(curyear)19.12E\n"
with open(self.output_filenames['fracdone']) as fp_frac:
fp_frac.write(template % self.user)

reg_text = "%19.12E %19.12E %19.12E %19.12E\n" % (self.user['curyear'],
np.mean(self.surface_ejc), np.amax(self.surface_ejc),
np.amin(self.surface_ejc))
with open(self.output_filenames['regodepth']) as fp_reg:
fp_reg.write(reg_text)

self.redirect_outputs(['odist', 'ocum', 'pdist', 'tdist'], 'dist')
if (self.user['savetruelist'].upper() == 'T'):
self.redirect_outputs(['tcum'], 'dist')
Expand Down

0 comments on commit 7557f79

Please sign in to comment.