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

Merge upstream changes #185

Merged
merged 103 commits into from
Jan 23, 2024
Merged

Merge upstream changes #185

merged 103 commits into from
Jan 23, 2024

Conversation

patkenneally
Copy link
Collaborator

  • Tickets addressed: NA
  • Review: By commit
  • Merge strategy: Merge (no squash)

Description

Incorporating Basilisk upstream changes

Verification

CI must run

Documentation

NA

Future work

NA

schaubh and others added 30 commits November 21, 2023 07:32
… if the expected versions of python are being called.
The class and a variable didn't have definitions
Adjust the name of the testing function.
…in_storageUnit

Feature/506 set data buffer method in storage unit
…write

Feature/322 simIncludeGravBody rewrite
…to_int64

Refactor/508 change variable in StorageUnit from long int to int64_t
schaubh and others added 26 commits December 22, 2023 10:41
Treat python version as string, rather than float, to accommodate python >=3.10
correct import statement in bskLogger documentation
…d-file

Add return statement in Albedo model to avoid segfaulting while processing invalid file
These changes include renaming variables, editing
comments, and moving lines of code to more logical
locations
The SepMomentumManagement scenario must also be
refactored to run with the new changes
…t-articulation

Feature/498 add srp effector facet articulation
Too many people stumble across this challeng on how to install conan without
jumping to the latest 2.x version, figuring out how to install the latest 1.x
version of conan, etc.  Until we upgrade BSK to conan 2.x, I am
going to just be explicit here.
be explicit about installing the latest 1.x version of conan
…n-in-loop

Legacy variable logging not selecting correct task
…idated-workflow

Cancel workflow for invalidated branch
@patkenneally patkenneally self-assigned this Jan 23, 2024
@patkenneally patkenneally merged commit 60a68d3 into develop Jan 23, 2024
2 checks passed
@patkenneally patkenneally deleted the feature/merge-upstream-changes branch January 23, 2024 18:37
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.

9 participants