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

Add a configuration option to use integrate over integrate_or_interpolate #1034

Open
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

KatKiker
Copy link

Creates a config parameter to allow use of the rebound integrate method instead of assist's integrate_or_interpolate. create_ephemeris sets a global variable from the config which is checked in integrate_light_time. This seemed less messy than drilling the option down to the lower functions, but happy to do it that way as well if that's preferable. This circumvents the infinite bound errors we were seeing, and is helpful in fast moving or close-approach scenarios where the timestep is small.

Review Checklist for Source Code Changes

  • Does pip install still work?
  • Have you written a unit test for any new functions?
  • Do all the units tests run successfully?
  • Does Sorcha run successfully on a test set of input files/databases?
  • Have you used black on the files you have updated to confirm python programming style guide enforcement?

Copy link

codecov bot commented Oct 14, 2024

Codecov Report

Attention: Patch coverage is 68.75000% with 5 lines in your changes missing coverage. Please review.

Project coverage is 81.08%. Comparing base (c2b800c) to head (15ae572).
Report is 24 commits behind head on main.

Files with missing lines Patch % Lines
src/sorcha/modules/PPConfigParser.py 42.85% 4 Missing ⚠️
src/sorcha/ephemeris/simulation_geometry.py 85.71% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1034      +/-   ##
==========================================
+ Coverage   80.90%   81.08%   +0.17%     
==========================================
  Files          70       70              
  Lines        3148     3182      +34     
==========================================
+ Hits         2547     2580      +33     
- Misses        601      602       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bernardinelli
Copy link
Collaborator

This is great!!! One question before approving: which one is set by default? Integrate_or_interpolate or just integrate?

@matthewholman
Copy link
Collaborator

matthewholman commented Oct 21, 2024 via email

@mschwamb
Copy link
Collaborator

@matthewholman definitely you have 2-3 days to review this

@KatKiker
Copy link
Author

This is great!!! One question before approving: which one is set by default? Integrate_or_interpolate or just integrate?

By default it's set to integrate_and_interpolate

@mschwamb
Copy link
Collaborator

We haven't forgotten about this @KatKiker - We're working on getting in a data class for the config file parser that will make it easier to remove the global variables we have hard coded for ephemeris generation. Once that's done and this is rebased to include those upgrades, we'll likely be able to merge straight away. I think we'll be there by the end of the month.

@mschwamb
Copy link
Collaborator

@KatKiker we've made some updates that now have all of the ephemeris generation properties in the config file with variables in a config file data class. Can you rebase to follow the architecture in just merged PR #1077 and then we'll be able to get this included

@akoumjian akoumjian force-pushed the integrate-global-variable branch from 15ae572 to 9b316d6 Compare December 19, 2024 16:26
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.

5 participants