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.

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

Jump to bottom

Activity State #92

Merged
merged 34 commits into from
Feb 7, 2022
Merged

Activity State #92

merged 34 commits into from
Feb 7, 2022

Conversation

FG-TUM
Copy link
Collaborator

@FG-TUM FG-TUM commented Jan 18, 2022 •
edited
Loading

Description

  • Add ActivityState to Particle
  • Add mass and radius to Particle
  • Consider ActivityState and radius for collisions (not the interpolations!)
  • Write/Read new Particle properties to/from HDF5
  • Set AoM correctly
  • Set ballistic coefficient correctly
  • Set drag coefficient via input
  • Set read fallback values in the in-memory yaml

Related Pull Requests

Resolved Issues

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.

  • New tests from Propagator Repo
  • New Tests for collisions
  • 1 Month simulation

@FG-TUM FG-TUM added the Enhancement New feature or request label Jan 18, 2022
@FG-TUM FG-TUM self-assigned this Jan 18, 2022
@gomezzz gomezzz mentioned this pull request Jan 18, 2022
Merged
1 task
@FG-TUM FG-TUM requested a review from gomezzz January 20, 2022 16:10
@FG-TUM
Copy link
Collaborator Author

FG-TUM commented Jan 21, 2022 •
edited
Loading

There is no mechanism yet for passing the activity state into the simulation through csv. Currently Particles are read at the following points:

  • DatasetReader::readDataset() through CSVReader -> sets everything to passive
  • Constellation::readConstellation() through CSVReader -> sets everything to evasivePreserving
  • HDF5Reader::readParticles() -> sets everything to whatever is in the HDF5 static data.

But that can probably be deferred to a different PR @gomezzz ?

gomezzz
gomezzz requested changes Jan 25, 2022
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

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

Some minor questions / comments

src/ladds/CollisionFunctor.cpp Show resolved Hide resolved
src/ladds/CollisionFunctor.h Outdated Show resolved Hide resolved
src/ladds/io/hdf5/HDF5Definitions.h Outdated Show resolved Hide resolved
src/ladds/io/hdf5/HDF5Writer.cpp Show resolved Hide resolved
src/ladds/io/hdf5/HDF5Writer.cpp Outdated Show resolved Hide resolved
src/ladds/io/hdf5/HDF5Writer.cpp Show resolved Hide resolved
src/ladds/particle/Constellation.cpp Outdated Show resolved Hide resolved
src/ladds/particle/Particle.cpp Show resolved Hide resolved
src/ladds/particle/Particle.h Outdated Show resolved Hide resolved
src/ladds/particle/SatelliteToParticleConverter.h Outdated Show resolved Hide resolved
@gomezzz
Copy link
Collaborator

gomezzz commented Jan 25, 2022

Also just noted that this may need an update now https://github.com/esa/LADDS#hdf5

@FG-TUM
Copy link
Collaborator Author

FG-TUM commented Jan 25, 2022

Also just noted that this may need an update now https://github.com/esa/LADDS#hdf5

Totally missed that! Done -> 83b84d3

@FG-TUM FG-TUM requested a review from gomezzz January 25, 2022 15:50
gomezzz
gomezzz approved these changes Jan 25, 2022
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

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

Just two small comments / questions, codewise ready to be merged

@FG-TUM FG-TUM changed the base branch from main to mergeBranch January 31, 2022 18:50
@FG-TUM FG-TUM requested a review from gomezzz January 31, 2022 18:51
@FG-TUM FG-TUM mentioned this pull request Feb 1, 2022
Closed
2 tasks
gomezzz
gomezzz requested changes Feb 1, 2022
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

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

(only looked at the recent changes since last review)

src/ladds/io/DatasetReader.cpp Outdated Show resolved Hide resolved
src/ladds/io/hdf5/HDF5Reader.cpp Outdated Show resolved Hide resolved
src/ladds/particle/Constellation.cpp Outdated Show resolved Hide resolved
@FG-TUM FG-TUM mentioned this pull request Feb 1, 2022
Merged
4 tasks
FG-TUM added 3 commits February 3, 2022 15:38
@FG-TUM
Merge branch 'mergeBranch' into ActivityState
a3cf7b5
@FG-TUM
YAML Reader: if a fallback value is used store it in the yaml structu…
9f45179 
…re so it is used by all following calls
@FG-TUM
coefficientOfDrag as optional yaml parameter:
2fce20d 
- read it in HDF5Reader, SatelliteLoader, DatasetReader (=csv)
- use it in ParticleConverter
- make sure all retrieve the same value from YAML even if fallback is used
- adapt tests
@FG-TUM FG-TUM requested a review from gomezzz February 3, 2022 16:44
gomezzz
gomezzz reviewed Feb 4, 2022
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

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

2 minor questions

src/ladds/io/DatasetReader.cpp Show resolved Hide resolved
src/ladds/io/SatelliteLoader.cpp Show resolved Hide resolved
@FG-TUM FG-TUM requested a review from gomezzz February 4, 2022 16:00
@FG-TUM FG-TUM merged commit 7b05867 into mergeBranch Feb 7, 2022
@FG-TUM FG-TUM deleted the ActivityState branch February 7, 2022 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gomezzz gomezzz Awaiting requested review from gomezzz

Assignees

@FG-TUM FG-TUM

Labels
Enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add particle types Store mass of particles
2 participants
@FG-TUM @gomezzz