Skip to content
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.

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

Phase tracing options #360

Merged
merged 8 commits into from
Dec 2, 2024
Merged

Phase tracing options #360

merged 8 commits into from
Dec 2, 2024

Conversation

og113
Copy link
Collaborator

@og113 og113 commented Nov 27, 2024

Added one option for setting the first step size in phase tracing. Option can be fixed with config.

 phaseTracerFirstStep: float | None = None
  r"""
  Starting step for phaseTrace. If a float, this gives the starting step
  size in units of the maximum step size :py:data:`dT`. If :py:data:`None` then
  uses the initial step size algorithm of :py:mod:`scipy.integrate.solve_ivp`.
  """

In the model files, I've put the option to None for all the models except the Standard Model, where I have set it to 1.0. Is this correct? I couldn't quite remember.

@jorindevandevis
Copy link
Collaborator

Great, for the SM I can now reproduce the results we had in the draft earlier.
But I'm a little bit confused about this, because when we obtained them earlier, we used the default initial step size, and on main we use the maximum step size, right?

@jorindevandevis
Copy link
Collaborator

Also the model file from one of the beta testers that we had trouble with earlier works without modifications, which is very good!

@og113
Copy link
Collaborator Author

og113 commented Nov 29, 2024

Great, for the SM I can now reproduce the results we had in the draft earlier. But I'm a little bit confused about this, because when we obtained them earlier, we used the default initial step size, and on main we use the maximum step size, right?

I actually don't know what version of the code the SM results in our paper were produced with. I thought that they weren't produced with v1.0.0 but I could be wrong.

@jorindevandevis
Copy link
Collaborator

No, indeed, the graph was not made with v.1.0.0.
I think I misunderstood the description above. Does None or 1.0 give the v.1.0.0 behavior?

@og113
Copy link
Collaborator Author

og113 commented Nov 29, 2024

Looks to me like v1.0.0 is equivalent to phaseTracerFirstStep=1.

See:

first_step=dT,

@jorindevandevis
Copy link
Collaborator

Added one option for setting the first step size in phase tracing. Option can be fixed with config.

 phaseTracerFirstStep: float | None = None
  r"""
  Starting step for phaseTrace. If a float, this gives the starting step
  size in units of the maximum step size :py:data:`dT`. If :py:data:`None` then
  uses the initial step size algorithm of :py:mod:`scipy.integrate.solve_ivp`.
  """

In the model files, I've put the option to None for all the models except the Standard Model, where I have set it to 1.0. Is this correct? I couldn't quite remember.

Ahhhh now I see why I was confused. For the SM it is actually set to None, not to 1.0. None is indeed the right value, so I was confused why this would work with 1.0.

Copy link
Collaborator

@jorindevandevis jorindevandevis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works very well, I have tested it for all BM models. Thanks a lot!

@og113
Copy link
Collaborator Author

og113 commented Dec 2, 2024

Thanks Jorinde for your comments. This helped me realise that the loading of the new config parameter wasn't working (so all were using the default None). This has now been fixed.

@og113 og113 merged commit adf0d6e into main Dec 2, 2024
6 checks passed
@og113 og113 deleted the phaseTracingOptions branch December 2, 2024 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants