Skip to content

Fix milestones for scenarios #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RemDelaporteMathurin merged 2 commits into from
Dec 5, 2024
Merged

Fix milestones for scenarios #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e0eed
fixed milestones for pulses
RemDelaporteMathurin Dec 4, 2024
f83950e
add final time to avoid overshoot
RemDelaporteMathurin Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions examples/all_bin_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import matplotlib.pyplot as plt
import json

from numpy.typing import NDArray

from hisp.plamsa_data_handling import PlasmaDataHandling
from hisp.festim_models import (
Expand All @@ -12,7 +11,7 @@
make_temperature_function,
make_particle_flux_function,
)
from make_iter_bins import FW_bins, Div_bins, total_fw_bins, total_nb_bins
from make_iter_bins import FW_bins, Div_bins

from hisp.helpers import periodic_step_function
from hisp.scenario import Scenario, Pulse
Expand Down Expand Up @@ -148,8 +147,19 @@ def which_model(subbin: SubBin | DivBin):
my_model, quantities = which_model(sub_bin)

# add milestones for stepsize and adaptivity
milestones = [pulse.total_duration for pulse in my_scenario.pulses]
milestones += [pulse.duration_no_waiting for pulse in my_scenario.pulses]
milestones = []
current_time = 0
for pulse in my_scenario.pulses:
start_of_pulse = my_scenario.get_time_start_current_pulse(current_time)
for i in range(pulse.nb_pulses):
milestones.append(start_of_pulse + pulse.total_duration * (i + 1))
milestones.append(
start_of_pulse
+ pulse.total_duration * i
+ pulse.duration_no_waiting
)

current_time = start_of_pulse + pulse.total_duration * pulse.nb_pulses
milestones.append(my_model.settings.final_time)
milestones = sorted(np.unique(milestones))
my_model.settings.stepsize.milestones = milestones
Expand Down Expand Up @@ -181,8 +191,20 @@ def which_model(subbin: SubBin | DivBin):
my_model, quantities = which_model(div_bin)

# add milestones for stepsize and adaptivity
milestones = [pulse.total_duration for pulse in my_scenario.pulses]
milestones += [pulse.duration_no_waiting for pulse in my_scenario.pulses]
milestones = []
current_time = 0
for pulse in my_scenario.pulses:
start_of_pulse = my_scenario.get_time_start_current_pulse(current_time)
for i in range(pulse.nb_pulses):
milestones.append(start_of_pulse + pulse.total_duration * (i + 1))
milestones.append(
start_of_pulse
+ pulse.total_duration * i
+ pulse.duration_no_waiting
)

current_time = start_of_pulse + pulse.total_duration * pulse.nb_pulses

milestones.append(my_model.settings.final_time)
milestones = sorted(np.unique(milestones))
my_model.settings.stepsize.milestones = milestones
Expand Down