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

Split TLEM 1 and 2 models #802

Merged
merged 11 commits into from
Jun 8, 2023
Merged

Split TLEM 1 and 2 models #802

merged 11 commits into from
Jun 8, 2023

Conversation

melund
Copy link
Member

@melund melund commented May 31, 2023

This PR aims to separate the TLEM 1 and 2 models.

A new folder AAUHuman/LegTLEM2 will hold all TLEM 2 code where intermingled TLEM1 code will be removed.

The old LegTLEM folder will continue to hold old code with intermingled TLEM1/2 code. Using the TLEM1 model from this folder will trigger a deprecation warning.

In order to ensure the correct Git history the LegTLEM folder has been copied to LegTLEM_Old, so LegTLEM2 can eventually have the unbroken history.

@melund melund changed the base branch from master to master-ammr-2.5 May 31, 2023 19:59
@melund melund force-pushed the split-tlem branch 2 times, most recently from f02a0e4 to e346716 Compare June 1, 2023 11:09
@melund melund changed the title Draft: Split TLEM 1 and 2 models Split TLEM 1 and 2 models Jun 1, 2023
@melund
Copy link
Member Author

melund commented Jun 1, 2023

@depierie. Just a heads up.

We decided to split the TLEM 1/2 model implementation. So code is not intermingled with BM_* statements. It should make code much simpler. This PR does exactly this.

We also plan to issue a deprecation warning when users run with TLEM 1.

@melund melund force-pushed the split-tlem branch 2 times, most recently from 8a40760 to 8ba22c1 Compare June 2, 2023 07:58
@melund melund requested a review from toerholm June 6, 2023 11:58
@melund
Copy link
Member Author

melund commented Jun 7, 2023

I have added the suggestion from @toerholm's review. All use of the BM_LEG_MORPHOLOGY switch have been removed from the code base, and all TLEM2 code have been removed from the LegTLEM1 folder. So now it is a clean split between TLEM 1/2.

This will be merged once tests pass.

@melund melund merged commit db115bb into master-ammr-2.5 Jun 8, 2023
@melund melund deleted the split-tlem branch June 8, 2023 06:18
@melund melund restored the split-tlem branch June 8, 2023 06:39
@melund melund deleted the split-tlem branch June 8, 2023 06:50
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.

1 participant