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

Bring UDUNITS Fortran interface to develop #2931

Open
bena-nasa opened this issue Jul 30, 2024 · 3 comments
Open

Bring UDUNITS Fortran interface to develop #2931

bena-nasa opened this issue Jul 30, 2024 · 3 comments
Assignees
Labels
📈 MAPL3 MAPL 3 Related 🎁 New Feature This is a new feature

Comments

@bena-nasa
Copy link
Collaborator

For the work to do vertical regridding in ExtData in MAPL2 having UDUNITS would be useful. I've already confirmed that if I copy over the udunits2f directory from release/MAPL-v3 it builds with the appropriate update to cmake find udunits so there's no technical problem. Just making an issue here for the PR. Unfortunately since this was done on release/MAPL-v3 first we can't just merge this back...

So I'm not sure what the best way to do this would be to avoid conflicts.

We could delete it in release/MAPL-v3, bring it to develop, then merge develop into release/MAPL-v3 as we have been doing?

@bena-nasa bena-nasa added 🎁 New Feature This is a new feature 📈 MAPL3 MAPL 3 Related labels Jul 30, 2024
@tclune
Copy link
Collaborator

tclune commented Jul 30, 2024

If it had been a single commit, you could do a cherry-pick, but I think it will be impractical. I think you have to just manually copy into place and deal with the merge conflicts - which will hopefully be of the trivial sort.

@mathomp4
Copy link
Member

Yeah, probably just needs to be a "bring files over manually". Once you (and @darianboggs) have something, I can do a test merge into MAPL3 to make sure all will be happy.

And, if not, well, once it's in, I can just force Git to be happy by making sure MAPL3 stays MAPL3!

@bena-nasa
Copy link
Collaborator Author

cool, I'll do that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📈 MAPL3 MAPL 3 Related 🎁 New Feature This is a new feature
Projects
None yet
Development

No branches or pull requests

4 participants