diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py index 7d3a4868..378d3261 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/cmds_multiuse.py @@ -1169,8 +1169,8 @@ class AddDebyeDispersion(UserObjectMulti): logger.info( f"{self.grid_name(grid)}Debye disperion added to {disp_material.ID} " - f"with delta_eps_r={', '.join('%4.2f' % deltaer for deltaer in disp_material.deltaer)}, " - f"and tau={', '.join('%4.3e' % tau for tau in disp_material.tau)} secs created." + f"with delta_eps_r={', '.join(f'{deltaer:4.2f}' for deltaer in disp_material.deltaer)}, " + f"and tau={', '.join(f'{tau:4.3e}' for tau in disp_material.tau)} secs created." ) @@ -1248,9 +1248,9 @@ class AddLorentzDispersion(UserObjectMulti): logger.info( f"{self.grid_name(grid)}Lorentz disperion added to {disp_material.ID} " - f"with delta_eps_r={', '.join('%4.2f' % deltaer for deltaer in disp_material.deltaer)}, " - f"omega={', '.join('%4.3e' % omega for omega in disp_material.tau)} secs, " - f"and gamma={', '.join('%4.3e' % delta for delta in disp_material.alpha)} created." + f"with delta_eps_r={', '.join(f'{deltaer:4.2f}' for deltaer in disp_material.deltaer)}, " + f"omega={', '.join(f'{omega:4.3e}' for omega in disp_material.tau)} secs, " + f"and gamma={', '.join(f'{delta:4.3e}' for delta in disp_material.alpha)} created." ) @@ -1322,8 +1322,8 @@ class AddDrudeDispersion(UserObjectMulti): logger.info( f"{self.grid_name(grid)}Drude disperion added to {disp_material.ID} " - f"with omega={', '.join('%4.3e' % omega for omega in disp_material.tau)} secs, " - f"and gamma={', '.join('%4.3e' % alpha for alpha in disp_material.alpha)} secs created." + f"with omega={', '.join(f'{omega:4.3e}' for omega in disp_material.tau)} secs, " + f"and gamma={', '.join(f'{alpha:4.3e}' for alpha in disp_material.alpha)} secs created." ) diff --git a/gprMax/materials.py b/gprMax/materials.py index 9a89951f..36f3f848 100644 --- a/gprMax/materials.py +++ b/gprMax/materials.py @@ -632,20 +632,20 @@ def process_materials(G): ] if config.get_model_config().materials["maxpoles"] > 0: if "debye" in material.type: - materialtext.append("\n".join("{:g}".format(deltaer) for deltaer in material.deltaer)) - materialtext.append("\n".join("{:g}".format(tau) for tau in material.tau)) + materialtext.append("\n".join(f"{deltaer:g}" for deltaer in material.deltaer)) + materialtext.append("\n".join(f"{tau:g}" for tau in material.tau)) materialtext.extend(["", "", ""]) elif "lorentz" in material.type: - materialtext.append(", ".join("{:g}".format(deltaer) for deltaer in material.deltaer)) + materialtext.append(", ".join(f"{deltaer:g}" for deltaer in material.deltaer)) materialtext.append("") - materialtext.append(", ".join("{:g}".format(tau) for tau in material.tau)) - materialtext.append(", ".join("{:g}".format(alpha) for alpha in material.alpha)) + materialtext.append(", ".join(f"{tau:g}" for tau in material.tau)) + materialtext.append(", ".join(f"{alpha:g}" for alpha in material.alpha)) materialtext.append("") elif "drude" in material.type: materialtext.extend(["", ""]) - materialtext.append(", ".join("{:g}".format(tau) for tau in material.tau)) + materialtext.append(", ".join(f"{tau:g}" for tau in material.tau)) materialtext.append("") - materialtext.append(", ".join("{:g}".format(alpha) for alpha in material.alpha)) + materialtext.append(", ".join(f"{alpha:g}" for alpha in material.alpha)) else: materialtext.extend(["", "", "", "", ""]) diff --git a/toolboxes/AntennaPatterns/initial_save.py b/toolboxes/AntennaPatterns/initial_save.py index b152d4f3..1c849ab4 100644 --- a/toolboxes/AntennaPatterns/initial_save.py +++ b/toolboxes/AntennaPatterns/initial_save.py @@ -65,10 +65,10 @@ if epsr: wavelength = v1 / f # Print some useful information -logger.info("Centre frequency: {} GHz".format(f / 1e9)) +logger.info(f"Centre frequency: {f / 1000000000.0} GHz") if epsr: - logger.info("Critical angle for Er {} is {} degrees".format(epsr, thetac)) - logger.info("Wavelength: {:.3f} m".format(wavelength)) + logger.info(f"Critical angle for Er {epsr} is {thetac} degrees") + logger.info(f"Wavelength: {wavelength:.3f} m") logger.info( "Observation distance(s) from {:.3f} m ({:.1f} wavelengths) to {:.3f} m ({:.1f} wavelengths)".format( radii[0], radii[0] / wavelength, radii[-1], radii[-1] / wavelength @@ -204,4 +204,4 @@ for radius in range(0, len(radii)): # Save pattern to numpy file np.save(os.path.splitext(outputfile)[0], patternsave) -logger.info("Written Numpy file: {}.npy".format(os.path.splitext(outputfile)[0])) +logger.info(f"Written Numpy file: {os.path.splitext(outputfile)[0]}.npy") diff --git a/toolboxes/AntennaPatterns/plot_fields.py b/toolboxes/AntennaPatterns/plot_fields.py index ff7c6dea..d6f85e4b 100644 --- a/toolboxes/AntennaPatterns/plot_fields.py +++ b/toolboxes/AntennaPatterns/plot_fields.py @@ -65,7 +65,7 @@ if epsr: logger.info(f"Centre frequency: {f / 1000000000.0} GHz") if epsr: logger.info(f"Critical angle for Er {epsr} is {thetac} degrees") - logger.info("Wavelength: {:.3f} m".format(wavelength)) + logger.info(f"Wavelength: {wavelength:.3f} m") logger.info( "Observation distance(s) from {:.3f} m ({:.1f} wavelengths) to {:.3f} m ({:.1f} wavelengths)".format( radii[0], radii[0] / wavelength, radii[-1], radii[-1] / wavelength @@ -107,7 +107,7 @@ for patt in range(0, len(radii)): # Replace any NaNs or Infs from zero division power[np.invert(np.isfinite(power))] = 0 - ax.plot(theta, power, label="{:.2f}m".format(radii[patt]), marker=".", ms=6, lw=1.5) + ax.plot(theta, power, label=f"{radii[patt]:.2f}m", marker=".", ms=6, lw=1.5) # Add Hertzian dipole plot # hertzplot1 = np.append(hertzian[0, :], hertzian[0, 0]) # Append start value to close circle diff --git a/toolboxes/DebyeFit/Debye_Fit.py b/toolboxes/DebyeFit/Debye_Fit.py index 8c711476..4df28463 100644 --- a/toolboxes/DebyeFit/Debye_Fit.py +++ b/toolboxes/DebyeFit/Debye_Fit.py @@ -220,14 +220,12 @@ class Relaxation(object): print(f" |{'e_inf':^14s}|{'De':^14s}|{'log(tau_0)':^25s}|") print("_" * 65) for i in range(0, len(tau)): - print("Debye {0:}|{1:^14.5f}|{2:^14.5f}|{3:^25.5f}|".format(i + 1, ee / len(tau), weights[i], tau[i])) + print(f"Debye {i + 1}|{ee / len(tau):^14.5f}|{weights[i]:^14.5f}|{tau[i]:^25.5f}|") print("_" * 65) # Print the Debye expnasion in a gprMax format material_prop = [] - material_prop.append( - "#material: {} {} {} {} {}\n".format(ee, self.sigma, self.mu, self.mu_sigma, self.material_name) - ) + material_prop.append(f"#material: {ee} {self.sigma} {self.mu} {self.mu_sigma} {self.material_name}\n") print(material_prop[0], end="") dispersion_prop = f"#add_dispersion_debye: {len(tau)}" for i in range(len(tau)):