diff --git a/src/scgenerator/evaluator.py b/src/scgenerator/evaluator.py index 603e324..94e99db 100644 --- a/src/scgenerator/evaluator.py +++ b/src/scgenerator/evaluator.py @@ -334,9 +334,9 @@ default_rules: list[Rule] = [ Rule("t0", pulse.soliton_num_to_t0), Rule("width", pulse.t0_to_width), Rule("soliton_num", pulse.soliton_num), - Rule("L_D", pulse.L_D), - Rule("L_NL", pulse.L_NL), - Rule("L_sol", pulse.L_sol), + Rule("dispersion_length", pulse.dispersion_length), + Rule("nonlinear_length", pulse.nonlinear_length), + Rule("soliton_length", pulse.soliton_length), Rule("c_to_a_factor", lambda: 1, priorities=-1), # Fiber Dispersion Rule("w_for_disp", units.m, ["wl_for_disp"]), diff --git a/src/scgenerator/parameter.py b/src/scgenerator/parameter.py index 0475085..10f552a 100644 --- a/src/scgenerator/parameter.py +++ b/src/scgenerator/parameter.py @@ -421,9 +421,9 @@ class Parameters: w_c: np.ndarray = Parameter(type_checker(np.ndarray)) w0: float = Parameter(positive(float)) t: np.ndarray = Parameter(type_checker(np.ndarray)) - L_D: float = Parameter(non_negative(float, int)) - L_NL: float = Parameter(non_negative(float, int)) - L_sol: float = Parameter(non_negative(float, int)) + dispersion_length: float = Parameter(non_negative(float, int)) + nonlinear_length: float = Parameter(non_negative(float, int)) + soliton_length: float = Parameter(non_negative(float, int)) adapt_step_size: bool = Parameter(boolean) hr_w: np.ndarray = Parameter(type_checker(np.ndarray)) z_targets: np.ndarray = Parameter(type_checker(np.ndarray)) diff --git a/src/scgenerator/physics/pulse.py b/src/scgenerator/physics/pulse.py index 5ab8c38..b33114d 100644 --- a/src/scgenerator/physics/pulse.py +++ b/src/scgenerator/physics/pulse.py @@ -323,7 +323,7 @@ def conform_pulse_params( return width, t0, peak_power, energy else: if soliton_num is None: - soliton_num = np.sqrt(peak_power * gamma * L_D(t0, beta2)) + soliton_num = np.sqrt(peak_power * gamma * dispersion_length(t0, beta2)) return width, t0, peak_power, energy, soliton_num @@ -351,20 +351,20 @@ def soliton_num_to_t0(soliton_num, beta2, gamma, peak_power): return np.sqrt(soliton_num**2 * abs(beta2) / (peak_power * gamma)) -def soliton_num(L_D, L_NL): - return np.sqrt(L_D / L_NL) +def soliton_num(dispersion_length, nonlinear_length): + return np.sqrt(dispersion_length / nonlinear_length) -def L_D(t0, beta2): +def dispersion_length(t0, beta2): return t0**2 / abs(beta2) -def L_NL(peak_power, gamma): +def nonlinear_length(peak_power, gamma): return 1 / (gamma * peak_power) -def L_sol(L_D): - return pi / 2 * L_D +def soliton_length(dispersion_length): + return pi / 2 * dispersion_length def adjust_custom_field(