From 97d6cb4364010ba74b34d3b1e8c67b331170b4f4 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Mon, 8 Aug 2016 15:35:30 +0100 Subject: [PATCH] Trying fixes for progress bars in Windows. --- gprMax/gprMax.py | 6 +++--- gprMax/input_cmds_geometry.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py index 4fe25831..74154529 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', ncols=get_terminal_size()[0], bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}') + pbar = tqdm(total=2, desc='Building FDTD grid', ncols=get_terminal_size()[0], leave='False', bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}') build_electric_components(G.solid, G.rigidE, G.ID, G) pbar.update() build_magnetic_components(G.solid, G.rigidH, G.ID, G) @@ -410,7 +410,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='files', ncols=get_terminal_size()[0], bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): + for geometryview in tqdm(G.geometryviews, desc='Writing geometry file(s)', unit='files', ncols=get_terminal_size()[0], leave='False', bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): geometryview.write_vtk(modelrun, numbermodelruns, G) # geometryview.write_xdmf(modelrun, numbermodelruns, G) @@ -437,7 +437,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, usernamespace): # Absolute time abstime = 0 - for timestep in tqdm(range(G.iterations), desc='Running model ' + str(modelrun) + ' of ' + str(numbermodelruns), ncols=get_terminal_size()[0], bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): + for timestep in tqdm(range(G.iterations), desc='Running model ' + str(modelrun) + ' of ' + str(numbermodelruns), ncols=get_terminal_size()[0], leave='False', bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): # 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 974e692f..67692c80 100644 --- a/gprMax/input_cmds_geometry.py +++ b/gprMax/input_cmds_geometry.py @@ -42,7 +42,7 @@ def process_geometrycmds(geometry, G): """ - for object in tqdm(geometry, desc='Processing geometry cmds', unit='cmds', ncols=get_terminal_size()[0], bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): + for object in tqdm(geometry, desc='Processing geometry cmds', unit='cmds', ncols=get_terminal_size()[0], leave='False', bar_format='{desc:30}{percentage:3.0f}%|{bar}{r_bar}'): tmp = object.split() if tmp[0] == '#geometry_objects_file:':