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

Building with Make.local & Updates to stracker_class #34

Merged
merged 39 commits into from
Sep 25, 2024
Merged

Building with Make.local & Updates to stracker_class #34

merged 39 commits into from
Sep 25, 2024

Conversation

markowkes
Copy link

@markowkes markowkes commented Jun 1, 2023 •
edited
Loading

  • Updates to allow the use of Make.local
  • Updates to stracker_class

@markowkes markowkes changed the title Develop Building with Make.local Jun 1, 2023
markowkes and others added 24 commits June 5, 2023 15:10
@markowkes
Changed collision vf initialization to method-in-place
d18b5c4
@markowkes
Updated drop_breakup to method-in-place initialization & updated sgs
e58211f
@markowkes
Changed order of array in CCL to avoid temp array in communication.
c0d8a77
@markowkes
Merge branch 'develop' of https://github.com/desjardi/NGA2 into develop
4531fea 
# Conflicts:
#	examples/collision/src/simulation.f90
@markowkes
Merged structures receive new id
9737e96
@markowkes
Fixed bugs with merged structures receive new id
509ebcf
@markowkes
Added tester for stracker_class
b50fee1
@markowkes
Added master merge and split lists - deals with merge edge cases
e074f22
@markowkes
Merge commit '89bcbb639f3a017f530a4794ba51f60e0cb76299' into develop
43b61e1
@markowkes
Added avl binary tree to speed up split identification
f9a43df
@markowkes
Improved avl_delete_all function
40f487f
@markowkes
Implemented crude writing of merges and splits. Currently failing on …
109d10d 
…line 337 of examples/stracker_tester/src/simulation.f90.
@markowkes
Fixed memory issue by initializing Imom & removed unused variables
10f60a8
@markowkes
using MPI_IN_PLACE and fixed advance in write statements.
9984eab
@markowkes
Clean-up of avl_trees.f90
936c55e
@bvchriste18
Added outputs and headers for merge_split.csv file. TO-DO: Rewind fil…
3bdcbe6 
…e to current time when initializing. Test in parallel.
@markowkes
Fixed initialization of idcount on multiple procs
e3d1b1f
@markowkes
Parallelized output of merge_master and split_master lists
d62983c
@bvchriste18
Make sure we are on root when writing merge_split.csv
2188163
@bvchriste18
Merge remote-tracking branch 'upstream/develop' into develop
439e6cd
@markowkes
Fixed id used in moment of inertia calc
316168a
@bvchriste18
Fixed issue with ids list in parallel
9db66a8
@markowkes
Merge pull request #1 from bvchriste18/develop
6296f8d 
Merge Split Outputs update
@bvchriste18
Added diesel jet case
f52a2ec
bvchriste18 and others added 10 commits August 21, 2024 13:13
@bvchriste18
Added restarts to diesel jet simulation. Added routines to push/pull …
39325b2 
…integers in pardata for ids. A couple edits to outputs in stracker tester.
@bvchriste18
Now using ELVIRA to avoid saving barycenter calculations for restarts…
93f9101 
…. Restarts work now. Also added check to droplet analysis to prevent dividing by 0.
@bvchriste18
Testing to fix issue with loop over merge_master for struct stats calc
7440b06
@bvchriste18
TESTING - Added check to stracker_class to prevent division by 0 in r…
d472ae8 
…emap_id
@bvchriste18
TESTING: Changed same_label check that was resulting in arithmetic ov…
b651569 
…erflow from int multiplication of id_remaps.
@bvchriste18
Fixed issue with local vs global id lists in new_id. Edited execute_s…
ba7184d 
…plit so that the liquid core (largest + id=1) keeps its id. Might be a better way to do this...
@bvchriste18
Forgot to deal with merges before. Not sure if everything is working,…
2302b9d 
… but core should retain it's id through splits or merges.
@bvchriste18
Another edit to merges to ensure core is not changed when merged. Had…
1949e1d 
… to edit collapse_merges to prevent a chain of merges from re-identifying the core.
@markowkes
Merge pull request #2 from bvchriste18/develop
8cdb65b 
Fixes for stracker_class
@markowkes
Merge pull request #3 from desjardi/develop
dcd8f03 
Develop
@markowkes markowkes changed the title Building with Make.local Building with Make.local & Updates to stracker_class Sep 17, 2024
@desjardi desjardi self-assigned this Sep 25, 2024
@desjardi desjardi merged commit fe9cb09 into desjardi:develop Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@desjardi desjardi desjardi approved these changes

Assignees

@desjardi desjardi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@markowkes @desjardi @bvchriste18