Conversation
|
Looks like you are a couple of commits behind main - that's might be why CI doesn't run |
Can you elaborate please, behind |
96a8d8c to
adf585d
Compare
Testing updates of CDEPS, CMEPS and CESM_share. See PR `rc-2026.01.000`: ACCESS-NRI/access3-share#19
|
See the CI failures here @chrisb13 - the added files in the submodules will need adding to the relevant CMakeLists |
|
Yeah, thanks @anton-seaice. I'm not sure what to do with some of the files. Let's look at an example. In Then, going through the diff, we have the following new *.F90 files: So I think file number 3 can go here: access3-share/CDEPS/CMakeLists.txt Lines 53 to 63 in adf585d But I don't see 1-2 and 4 go? |
Adding the new file so that hopefully CESM_share will build. See @anton-seaice suggestion: #19 (comment)
Reverting the access3-share commit because it's not ready yet (see ACCESS-NRI/access3-share#19 (comment))
...
Yep - sounds good.
I think we might not need them (we don't build |
|
Thanks @anton-seaice, so I'm sorted then for CDEPS (d04c67d) and CESM_share (7a7c60b) but still not sure what to do about the two files I mentioned for CMEPS? |
Adding the new file so that hopefully CDEPS will build. See @anton-seaice comment: #19 (comment)
We hopefully don't need the files with For |
Adding the new file so that hopefully CESM_share will build. See @anton-seaice suggestion: #19 (comment)
Adding the new file so that hopefully CMEPS will build. See @anton-seaice suggestion: #19 (comment)
4d444e1 to
86a9f1a
Compare
|
H'm, none of them worked: Any thoughts @anton-seaice ? Here's an example error: make[2]: *** [CDEPS/CMakeFiles/ACCESS3_cdeps_datm.dir/build.make:77
: CDEPS/atm_comp_nuopc.F90] Error 1 |
|
It appears to have progressed further. From https://github.com/ACCESS-NRI/access3-share/actions/runs/20945603484/job/60187940655#step:14:4118 It looks like whatever has changed upstream in I can't really remember the best way to fix that - possibly hand editing https://github.com/ACCESS-NRI/access3-share/blob/rc-2026.01.000/CDEPS/patches/atm_comp_nuopc.F90.patch ? (Or possibly there is a better git way.) |
|
Ah thanks. For book keeping, Hunks 2,5 and 7 failed, i.e.: access3-share/CDEPS/patches/atm_comp_nuopc.F90.patch Lines 52 to 53 in 86a9f1a access3-share/CDEPS/patches/atm_comp_nuopc.F90.patch Lines 71 to 72 in 86a9f1a |
2ced3ac to
848a5ae
Compare
|
Okay, so just checked 848a5ae, and the commits in the repo align with the proposed ones for CMEPS, CDEPS and CESM_share. |
Rolling back mom6 version for the time being whilst we check that the latest `access3-share` works (`rc-2026.01.000`). This uses the forks version of CMEPS, CDEPS and CESM_share as well as the updated patches/files from here: ACCESS-NRI/access3-share#22 (comment) Also related: ACCESS-NRI/access3-share#19
Changing version of `access3-share` incrementally across the components. This is just testing the change of CMEPS to using our fork. See: - ACCESS-NRI/access3-share@342685c - ACCESS-NRI/access3-share#19
45c251a to
a00b037
Compare
a00b037 to
ed7680e
Compare
ed7680e to
40056d0
Compare
|
I split the CMEPS commit into two: one for CMEPS and one for removing the patching function, to make this easier to cherry-pick / rearrange as needed |
|
This has been superseded by #29 - ill leave this open in case further investigations are needed |
Updating CDEPS, CMEPS and CESM_share as discussed
ACCESS-NRI/access-om3-configs#1028 (comment)