From be52f8fcacfdba9ee0594deead0621c673cb63e8 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Mon, 8 Aug 2016 14:43:55 +0100 Subject: [PATCH] Updates to progress bars. --- gprMax/gprMax.py | 6 +++--- gprMax/input_cmds_geometry.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py index 05677350..bdfac233 100644 --- a/gprMax/gprMax.py +++ b/gprMax/gprMax.py @@ -344,7 +344,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, usernamespace): # Build the model, i.e. set the material properties (ID) for every edge of every Yee cell print() - pbar = tqdm(total=2, desc='Building FDTD grid') + pbar = tqdm(total=2, desc='Building FDTD grid', ncols=get_terminal_size()[0]) build_electric_components(G.solid, G.rigidE, G.ID, G) pbar.update() build_magnetic_components(G.solid, G.rigidH, G.ID, G) @@ -409,7 +409,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, usernamespace): raise GeneralError('No geometry views found.') elif G.geometryviews: print() - for geometryview in tqdm(G.geometryviews, desc='Writing geometry file(s)', unit='file'): + for geometryview in tqdm(G.geometryviews, desc='Writing geometry file(s)', unit='file', ncols=get_terminal_size()[0]): geometryview.write_vtk(modelrun, numbermodelruns, G) # geometryview.write_xdmf(modelrun, numbermodelruns, G) @@ -436,7 +436,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, usernamespace): # Absolute time abstime = 0 - for timestep in tqdm(range(G.iterations), desc='Running simulation, model ' + str(modelrun) + ' of ' + str(numbermodelruns)): + for timestep in tqdm(range(G.iterations), desc='Running simulation, model ' + str(modelrun) + ' of ' + str(numbermodelruns), ncols=get_terminal_size()[0]): # Store field component values for every receiver and transmission line store_outputs(timestep, G.Ex, G.Ey, G.Ez, G.Hx, G.Hy, G.Hz, G) diff --git a/gprMax/input_cmds_geometry.py b/gprMax/input_cmds_geometry.py index aef59107..14448c48 100644 --- a/gprMax/input_cmds_geometry.py +++ b/gprMax/input_cmds_geometry.py @@ -17,6 +17,7 @@ # along with gprMax. If not, see . import os +from shutil import get_terminal_size import h5py import numpy as np @@ -41,7 +42,7 @@ def process_geometrycmds(geometry, G): """ - for object in tqdm(geometry, desc='Processing geometry objects', unit='cmds'): + for object in tqdm(geometry, desc='Processing geometry objects', unit='cmds', ncols=get_terminal_size()[0]): tmp = object.split() if tmp[0] == '#geometry_objects_file:':