From e240f8d449faa69abfffec028fb5ff664751cabc Mon Sep 17 00:00:00 2001 From: David Minton Date: Wed, 28 Aug 2019 19:06:15 -0400 Subject: [PATCH] Updated python scripts to be compatible with Python 3 --- python/ctem_driver.py | 14 +++++++------- python/ctem_io_readers.py | 32 ++++++++++++++++---------------- python/ctem_io_writers.py | 8 ++++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/python/ctem_driver.py b/python/ctem_driver.py index 8d1b1adc..84ad07db 100644 --- a/python/ctem_driver.py +++ b/python/ctem_driver.py @@ -81,7 +81,7 @@ #Starting new or old run? if (parameters['restart'].upper() == 'F'): - print 'Starting a new run' + print('Starting a new run') if (parameters['runtype'].upper() == 'STATISTICAL'): parameters['ncount'] = 1 @@ -98,7 +98,7 @@ os.remove(tdist_file) else: - print 'Continuing a previous run' + print('Continuing a previous run') #Read surface dem(shaded relief) and ejecta data files dem_file = parameters['workingdir'] + 'surface_dem.dat' @@ -128,7 +128,7 @@ fp_reg = open(filename,'w') #Begin CTEM processing loops -print 'Beginning loops' +print('Beginning loops') ctem_io_writers.create_dir_structure(parameters) @@ -143,17 +143,17 @@ shutil.copy2(forig, fdest) #Create crater population and display CTEM progress on screen - print parameters['ncount'], ' Calling FORTRAN routine' + print(parameters['ncount'], ' Calling FORTRAN routine') proc = subprocess.Popen([parameters['workingdir']+'CTEM'],stdout=subprocess.PIPE,bufsize=1, universal_newlines=True) for line in proc.stdout: - print line + print(line) proc.wait() #Optional: do not pipe CTEM progress to the screen #subprocess.check_output([parameters['workingdir']+'CTEM']) #Read Fortran output - print parameters['ncount'], ' Reading Fortran output' + print(parameters['ncount'], ' Reading Fortran output') #Read surface dem(shaded relief) and ejecta data files dem_file = parameters['workingdir'] + 'surface_dem.dat' @@ -191,7 +191,7 @@ ctem_io_writers.copy_dists(parameters) #Display results - print parameters['ncount'], ' Displaying results' + print(parameters['ncount'], ' Displaying results') #Write surface dem, surface ejecta, shaded relief, and rplot data ctem_io_writers.image_dem(parameters, surface_dem) diff --git a/python/ctem_io_readers.py b/python/ctem_io_readers.py index 3ca14e67..a58ba9ab 100644 --- a/python/ctem_io_readers.py +++ b/python/ctem_io_readers.py @@ -17,7 +17,7 @@ def read_ctemin(parameters,notset): inputfile = parameters['workingdir'] + parameters['ctemfile'] #Read ctem.in file - print 'Reading input file '+ parameters['ctemfile'] + print('Reading input file '+ parameters['ctemfile']) fp = open(inputfile,'r') lines = fp.readlines() fp.close() @@ -51,33 +51,33 @@ def read_ctemin(parameters,notset): #Test values for further processing if (parameters['interval'] <= 0.0): - print 'Invalid value for or missing variable INTERVAL in '+ inputfile + print('Invalid value for or missing variable INTERVAL in '+ inputfile) if (parameters['numintervals'] <= 0): - print 'Invalid value for or missing variable NUMINTERVALS in '+ inputfile + print('Invalid value for or missing variable NUMINTERVALS in '+ inputfile) if (parameters['pix'] <= 0.0): - print 'Invalid value for or missing variable PIX in '+ inputfile + print('Invalid value for or missing variable PIX in '+ inputfile) if (parameters['gridsize'] <= 0): - print 'Invalid value for or missing variable GRIDSIZE in '+ inputfile + print('Invalid value for or missing variable GRIDSIZE in '+ inputfile) if (parameters['seed'] == 0): - print 'Invalid value for or missing variable SEED in '+ inputfile + print('Invalid value for or missing variable SEED in '+ inputfile) if (parameters['sfdfile'] == notset): - print 'Invalid value for or missing variable SFDFILE in '+ inputfile + print('Invalid value for or missing variable SFDFILE in '+ inputfile) if (parameters['impfile'] == notset): - print 'Invalid value for or missing variable IMPFILE in '+ inputfile + print('Invalid value for or missing variable IMPFILE in '+ inputfile) if (parameters['popupconsole'] == notset): - print 'Invalid value for or missing variable POPUPCONSOLE in '+ inputfile + print('Invalid value for or missing variable POPUPCONSOLE in '+ inputfile) if (parameters['saveshaded'] == notset): - print 'Invalid value for or missing variable SAVESHADED in '+ inputfile + print('Invalid value for or missing variable SAVESHADED in '+ inputfile) if (parameters['saverego'] == notset): - print 'Invalid value for or missing variable SAVEREGO in '+ inputfile + print('Invalid value for or missing variable SAVEREGO in '+ inputfile) if (parameters['savepres'] == notset): - print 'Invalid value for or missing variable SAVEPRES in '+ inputfile + print('Invalid value for or missing variable SAVEPRES in '+ inputfile) if (parameters['savetruelist'] == notset): - print 'Invalid value for or missing variable SAVETRUELIST in '+ inputfile + print('Invalid value for or missing variable SAVETRUELIST in '+ inputfile) if (parameters['runtype'] == notset): - print 'Invalid value for or missing variable RUNTYPE in '+ inputfile + print('Invalid value for or missing variable RUNTYPE in '+ inputfile) if (parameters['restart'] == notset): - print 'Invalid value for or missing variable RESTART in '+ inputfile + print('Invalid value for or missing variable RESTART in '+ inputfile) return @@ -101,7 +101,7 @@ def read_ctemdat(parameters, seedarr): datfile = parameters['workingdir'] + 'ctem.dat' #Read ctem.dat file - print 'Reading input file '+ parameters['datfile'] + print('Reading input file '+ parameters['datfile']) fp = open(datfile,'r') lines = fp.readlines() fp.close() diff --git a/python/ctem_io_writers.py b/python/ctem_io_writers.py index 119b9cd9..5d591d9a 100644 --- a/python/ctem_io_writers.py +++ b/python/ctem_io_writers.py @@ -91,7 +91,7 @@ def image_dem(parameters, surface_dem): dem_map = 254.0 * numpy.cos(dem_map) #Save image to file - filename = parameters['workingdir'] + 'surf' + os.sep + "surf%06d.jpg" % parameters['ncount'] + filename = parameters['workingdir'] + 'surf' + os.sep + "surf%06d.png" % parameters['ncount'] height = parameters['gridsize'] / dpi width = height fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) @@ -113,7 +113,7 @@ def image_regolith(parameters, regolith): regolith_scaled = 254.0 * ((numpy.log(regolith_scaled) - numpy.log(minreg)) / (numpy.log(maxreg) - numpy.log(minreg))) #Save image to file - filename = parameters['workingdir'] + 'rego' + os.sep + "rego%06d.jpg" % parameters['ncount'] + filename = parameters['workingdir'] + 'rego' + os.sep + "rego%06d.png" % parameters['ncount'] height = parameters['gridsize'] / dpi width = height fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) @@ -177,7 +177,7 @@ def image_shaded_relief(parameters, surface_dem): shaded_imagearr = numpy.around(shaded_imagearr, decimals = 1) #Save image to file - filename = parameters['workingdir'] + 'shaded' + os.sep + "shaded%06d.jpg" % parameters['ncount'] + filename = parameters['workingdir'] + 'shaded' + os.sep + "shaded%06d.png" % parameters['ncount'] height = parameters['gridsize'] / dpi width = height fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) @@ -236,7 +236,7 @@ def create_rplot(parameters,odist,pdist,tdist,ph1): timelabel = 'Time = '+ r'${}$ x 10$^{}$'.format(tlabel[0], texp) + ' yrs' #Save image to file - filename = parameters['workingdir'] + 'rplot' + os.sep + "rplot%06d.jpg" % parameters['ncount'] + filename = parameters['workingdir'] + 'rplot' + os.sep + "rplot%06d.png" % parameters['ncount'] height = parameters['gridsize'] / dpi width = height fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi)