merge mixed mode base into mixedmode

[rem1776]

Description
merges mixedmode_base into mixedmode, brings in the latest main updates .

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules
• New check tests, if applicable, are included
• make distcheck passes

[mlee03]

Is something funky going on here? The mixedmode branch already contains this change and shouldn't show up here..? @J-Lentz, is this correct?

[mcallic2]

is this because its merging mixedmode_base, that was just updated into mixedmode?

[rem1776]

I feel like its from updating mixemode_base but not doing a merge commit with main so it views the commits as separate even though its the same changes. If you don't have a merge commit it just thinks its your own changes, when they should match up with the commits on the branch you are merging into. I'll try merging mixedmode into mixedmode_base and see if I can get this to go in cleanly.

After this merge I think we should get rid of mixedmode_base. The mixedmode braches should have the same includes and everything as mixedmode_base from merging our prs in, so we shouldn't need the other branch just for main updates. I think it would be cleaner and make more sense to merge main right into mixedmode and start our prs there, I can try it next time we need an update.