changes required for ESM16

[JhanSrbinovsky]

CABLE

Thank you for submitting a pull request to the CABLE Project.

Description

With these minor changes CABLE:main can be cloned directly into the ESM1.6 / UM7.3 code under umbase_hg3. NB:A lot of the changes are replicated from PRs that are waiting to be reviewed.

Fixes #473, #468

Type of change

For ESM1.6. A library can be built directly from this code

benchcab regression tessts successful:
benchmark_cable_qsub.sh.o128621374.txt

---

📚 Documentation preview 📚: https://cable--474.org.readthedocs.build/en/474/

[JhanSrbinovsky]

this is basically sub-suming branch 436 , PR#446 now

[bschroeter]

This is generally good, just a few comments around formatting and a general vent about code structure.

As per discussions with @ccarouge, we should leave the ESM1.5 directories alone and instead make these changes as new files in a comparable ESM1.6 that you will need to create:

coupled/ESM1.6
- CABLEfilesFromESM1.6

I'm not happy with the naming convention for these files, but I will save my opinions on this for another issue.

Also as discussed, we'd like to start seeing test results included in the PRs. Eventually, these are likely to be automated via benchcab, but in the interim some evidence of results from a successful would be nice to see.

@ccarouge, do you have any further comments?

[JhanSrbinovsky]

@bschroeter - see benchcab results. linked in PR description at top

[ccarouge]

To help solve the conflicts for this PR, I've done a rebase. This messes up with the review history but that's cleaner. I'll re-do a benchcab test to check the rebase is correct.

[JhanSrbinovsky]

you must not have pushed your rebase yet?

[ccarouge]

After the rebase, the benchcab run is successful with bitwise comparison:

2024-11-26 11:00:25,972 - INFO - benchcab.benchcab.py:391 - 0 failed, 168 passed

@JhanSrbinovsky the force push and the fact that all the commits are dated from 18 hours ago indicate the rebase.

[ccarouge]

It looks good to go to me. @JhanSrbinovsky can you check the changes look like what you expect, just in case I made a mistake in the rebase/conflict resolution. If you are ok with it, it's good to merge in.

[JhanSrbinovsky]

@JhanSrbinovsky the force push and the fact that all the commits are dated from 18 hours ago indicate the rebase.

I wonder why I can't git pull then? error tells me to rebase. I dont think I have any local changes

[JhanSrbinovsky]

@ccarouge, I reviewed here anyway. creating a coupled/ESM1.6 from these and reverting to the original ESM1.5 - is that still happening?

@bschroeter - we'll address naming in issue just created #487