diff --git a/gprMax/model_build_run.py b/gprMax/model_build_run.py index 2f82186c..9a9f59ed 100644 --- a/gprMax/model_build_run.py +++ b/gprMax/model_build_run.py @@ -175,14 +175,14 @@ class ModelBuildRun: # Check to see if numerical dispersion might be a problem results = dispersion_analysis(gb.grid) if results['error']: - log.warning(Fore.RED + f"\nNumerical dispersion analysis on {gb.grid.name} not carried out as {results['error']}" + Style.RESET_ALL) + log.warning(Fore.RED + f"\nNumerical dispersion analysis [{gb.grid.name}] not carried out as {results['error']}" + Style.RESET_ALL) elif results['N'] < config.get_model_config().numdispersion['mingridsampling']: - raise GeneralError(f"\nNon-physical wave propagation in {gb.grid.name} detected. Material '{results['material'].ID}' has wavelength sampled by {results['N']} cells, less than required minimum for physical wave propagation. Maximum significant frequency estimated as {results['maxfreq']:g}Hz") + raise GeneralError(f"\nNon-physical wave propagation in [{gb.grid.name}] detected. Material '{results['material'].ID}' has wavelength sampled by {results['N']} cells, less than required minimum for physical wave propagation. Maximum significant frequency estimated as {results['maxfreq']:g}Hz") elif (results['deltavp'] and np.abs(results['deltavp']) > config.get_model_config().numdispersion['maxnumericaldisp']): - log.warning(Fore.RED + f"\n{gb.grid.name} has potentially significant numerical dispersion. Estimated largest physical phase-velocity error is {results['deltavp']:.2f}% in material '{results['material'].ID}' whose wavelength sampled by {results['N']} cells. Maximum significant frequency estimated as {results['maxfreq']:g}Hz" + Style.RESET_ALL) + log.warning(Fore.RED + f"\n[{gb.grid.name}] has potentially significant numerical dispersion. Estimated largest physical phase-velocity error is {results['deltavp']:.2f}% in material '{results['material'].ID}' whose wavelength sampled by {results['N']} cells. Maximum significant frequency estimated as {results['maxfreq']:g}Hz" + Style.RESET_ALL) elif results['deltavp']: - log.info(f"\nNumerical dispersion analysis on {gb.grid.name}: estimated largest physical phase-velocity error is {results['deltavp']:.2f}% in material '{results['material'].ID}' whose wavelength sampled by {results['N']} cells. Maximum significant frequency estimated as {results['maxfreq']:g}Hz") + log.info(f"\nNumerical dispersion analysis [{gb.grid.name}]: estimated largest physical phase-velocity error is {results['deltavp']:.2f}% in material '{results['material'].ID}' whose wavelength sampled by {results['N']} cells. Maximum significant frequency estimated as {results['maxfreq']:g}Hz") def reuse_geometry(self): # Reset iteration number diff --git a/gprMax/pml.py b/gprMax/pml.py index e033ba2b..aabde132 100644 --- a/gprMax/pml.py +++ b/gprMax/pml.py @@ -434,7 +434,7 @@ def print_pml_info(G): pmlinfo += f'{key}: {value}, ' pmlinfo = pmlinfo[:-2] - return f'\nPML boundaries ({G.name}): {{formulation: {G.pmlformulation}, order: {len(G.cfs)}, thickness (cells): {pmlinfo}}}' + return f'\nPML boundaries [{G.name}]: {{formulation: {G.pmlformulation}, order: {len(G.cfs)}, thickness (cells): {pmlinfo}}}' def build_pml(G, key, value): diff --git a/gprMax/utilities.py b/gprMax/utilities.py index 01cb5c5e..48a4b50c 100644 --- a/gprMax/utilities.py +++ b/gprMax/utilities.py @@ -450,7 +450,7 @@ def mem_check_all(grids): total_snaps_mem += snap_mem grid.mem_use += snap_mem - mem_strs.append(f'~{human_size(grid.mem_use)} ({grid.name})') + mem_strs.append(f'~{human_size(grid.mem_use)} [{grid.name}]') total_mem = config.get_model_config().mem_use