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

ST_initialization.c and ST_initialization.h accidentally added back to Seed_Dispersal from master #532

Closed
kpalmqui opened this issue Sep 21, 2022 · 2 comments
Closed

ST_initialization.c and ST_initialization.h accidentally added back to Seed_Dispersal from master #532

kpalmqui opened this issue Sep 21, 2022 · 2 comments
Assignees
@kpalmqui
Labels
invalid
Milestone
Seed Dispersal

Comments

@kpalmqui
Copy link
Member

During a routine merge of master branch back into Seed_Dispersal, two files (ST_initialization.c and ST_initialization.h) that no longer existed in Seed_Dispersal were added back in by mistake. See: 7974a02

ST_initialization.c and ST_initialization.h were replaced by ST_spinup.c and ST_spinup.h in Seed_Dispersal branch via commit: c2eebf0

These duplicated files may be causing some of the downstream issues previously documented in this milestone.

This issue was discovered when trying to merge current branch of master (which still contains ST_initialization.c and ST_initialization.h) into Seed_Dispersal.

Solution: remove ST_initialization.c and ST_initialization.h from Seed_Dispersal after a careful review that all updates to these files since they were re-incorporated have been updated in ST_spinup.c and ST_spinup.h and associated testing of new code.

@mnovo323
@kpalmqui kpalmqui added this to the Seed Dispersal milestone Sep 21, 2022
@kpalmqui kpalmqui self-assigned this Sep 21, 2022
@kpalmqui
Copy link
Member Author

None of the functions in ST_initialization.c are being called in the Seed_Dispersal branch (note _run_spinup is duplicated in ST_spinup.c), thus the accidental addition of these files is having no effect.

kpalmqui added a commit that referenced this issue Sep 25, 2022
@kpalmqui
Implement new set_all_rngs in ST_spinup.c
c358460 
-implementing new random number generator function in ST_spinup.c, which doesn't exist in master branch

-note ST_spinup.c has replaced ST_initialization.c, which was accidentally re-committed see #532 - will be removed shortly.
kpalmqui added a commit that referenced this issue Sep 27, 2022
@kpalmqui
Remove ST_initialization.c & ST_initialization.h after they were acci…
8a8c158 
…dentally re-committed, issue #532

- Remove ST_initialization.c and ST_initialization.h that were accidentally re-committed by 7974a02

- ST_spinup.c and ST_spinup.h in Seed_Dispersal branch replaced these two files via commit c2eebf0
@kpalmqui
Copy link
Member Author

kpalmqui commented Mar 2, 2023

Resolved by 8a8c158

@kpalmqui kpalmqui closed this as completed Mar 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kpalmqui kpalmqui

Labels
invalid
Projects
None yet
Milestone
Seed Dispersal
Development

No branches or pull requests
1 participant
@kpalmqui