Removal of G object when --geometry-fixed is given should occur even if --geometry-only flag is being used.

这个提交包含在:
Craig Warren
2017-03-03 12:40:40 +00:00
父节点 a8223aea27
当前提交 ebb95d043d

查看文件

@@ -252,12 +252,12 @@ def run_model(args, currentmodelrun, numbermodelruns, inputfile, usernamespace):
print('Memory (RAM) used: ~{}'.format(human_size(p.memory_info().rss))) print('Memory (RAM) used: ~{}'.format(human_size(p.memory_info().rss)))
print('Solving time [HH:MM:SS]: {}'.format(datetime.timedelta(seconds=tsolve))) print('Solving time [HH:MM:SS]: {}'.format(datetime.timedelta(seconds=tsolve)))
# If geometry information to be reused between model runs then FDTDGrid class instance must be global so that it persists
if not args.geometry_fixed:
del G
return tsolve return tsolve
# If geometry information to be reused between model runs then FDTDGrid class instance must be global so that it persists
if not args.geometry_fixed:
del G
def solve_cpu(currentmodelrun, numbermodelruns, G): def solve_cpu(currentmodelrun, numbermodelruns, G):
"""Solving using FDTD method on CPU. Parallelised using Cython (OpenMP) for electric and magnetic field updates, and PML updates. """Solving using FDTD method on CPU. Parallelised using Cython (OpenMP) for electric and magnetic field updates, and PML updates.