Updates to progress bars.

这个提交包含在:
Craig Warren
2016-08-08 14:43:55 +01:00
父节点 711c2010f0
当前提交 be52f8fcac
共有 2 个文件被更改,包括 5 次插入4 次删除

查看文件

@@ -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)

查看文件

@@ -17,6 +17,7 @@
# along with gprMax. If not, see <http://www.gnu.org/licenses/>.
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:':