kpalmqui
commented
1 year ago 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.
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: https://github.com/DrylandEcology/STEPWAT2/commit/7974a02d4b5bf6227569b7ef4da278a67f2945ca
ST_initialization.c and ST_initialization.h were replaced by ST_spinup.c and ST_spinup.h in Seed_Dispersal branch via commit: https://github.com/DrylandEcology/STEPWAT2/commit/c2eebf007fa7077dec199486f158c93d5a3ba6a3
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