This commit is contained in:
Benoît Sierro
2021-06-21 15:21:48 +02:00
parent 5bd5e3e921
commit 991b6b81b0
3 changed files with 7 additions and 5 deletions

View File

@@ -216,7 +216,7 @@ def plot_init(args):
def plot_dispersion(args): def plot_dispersion(args):
if args.limits is None: if args.limits is None:
lims = [None, None] lims = None
else: else:
lims = 1e-9 * np.array(args.limits, dtype=float) lims = 1e-9 * np.array(args.limits, dtype=float)
scripts.plot_dispersion(args.config, lims) scripts.plot_dispersion(args.config, lims)

View File

@@ -14,7 +14,7 @@ from .errors import *
from .logger import get_logger from .logger import get_logger
from .math import power_fact from .math import power_fact
from .physics import fiber, pulse, units from .physics import fiber, pulse, units
from .utils import count_variations, override_config, required_simulations from .utils import count_variations, override_config, pretty_format_value, required_simulations
from .utils.parameter import BareConfig, BareParams, hc_model_specific_parameters from .utils.parameter import BareConfig, BareParams, hc_model_specific_parameters
@@ -519,13 +519,15 @@ def validate_config_sequence(*configs: os.PathLike) -> Tuple[Config, int]:
""" """
previous = None previous = None
variables = set() variables = set()
num = 1
for config in configs: for config in configs:
if (p := Path(config)).is_dir(): if (p := Path(config)).is_dir():
config = p / "initial_config.toml" config = p / "initial_config.toml"
dico = io.load_toml(config) dico = io.load_toml(config)
previous = Config.from_bare(override_config(dico, previous)) previous = Config.from_bare(override_config(dico, previous))
num *= previous.repeat
variables |= {(k, tuple(v)) for k, v in previous.variable.items()} variables |= {(k, tuple(v)) for k, v in previous.variable.items()}
return previous, np.product([len(v) for k, v in variables]) return previous, num * int(np.product([len(v) for k, v in variables if len(v) > 0]))
def wspace(t, t_num=0): def wspace(t, t_num=0):

View File

@@ -43,7 +43,7 @@ def plot_init_field_spec(
else: else:
continue continue
plot_1_init_spec_field(lim_t, lim_l, left, right, style, lbl, params) lbl = plot_1_init_spec_field(lim_t, lim_l, left, right, style, lbl, params)
all_labels.append(lbl) all_labels.append(lbl)
finish_plot(fig, left, right, all_labels, params) finish_plot(fig, left, right, all_labels, params)
@@ -60,7 +60,7 @@ def plot_dispersion(config_path: Path, lim: tuple[float, float] = None):
else: else:
continue continue
plot_1_dispersion(lim, left, right, style, lbl, params) lbl = plot_1_dispersion(lim, left, right, style, lbl, params)
all_labels.append(lbl) all_labels.append(lbl)
finish_plot(fig, left, right, all_labels, params) finish_plot(fig, left, right, all_labels, params)