search

GEOS-ESM / MAPL

MAPL is a foundation layer of the GEOS architecture, whose original purpose is to supplement the Earth System Modeling Framework (ESMF)
https://geos-esm.github.io/MAPL/
Apache License 2.0
25 stars 18 forks source link

Bring UDUNITS Fortran interface to develop #2931

Open bena-nasa opened 3 months ago

bena-nasa commented 3 months ago

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?

tclune commented 3 months ago

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 commented 3 months ago

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 commented 3 months ago

cool, I'll do that