Skip to content

Conversation

@chrisb13
Copy link
Contributor

@chrisb13 chrisb13 commented Jan 12, 2026

Updating CDEPS, CMEPS and CESM_share as discussed
ACCESS-NRI/access-om3-configs#1028 (comment)

@anton-seaice
Copy link
Collaborator

Looks like you are a couple of commits behind main - that's might be why CI doesn't run

@chrisb13
Copy link
Contributor Author

Looks like you are a couple of commits behind main - that's might be why CI doesn't run

Can you elaborate please, behind main where? I just followed the discussed table for what we want to update..?

@anton-seaice
Copy link
Collaborator

rc-2026.01.000...main

@chrisb13 chrisb13 force-pushed the rc-2026.01.000 branch 2 times, most recently from 96a8d8c to adf585d Compare January 13, 2026 03:38
chrisb13 added a commit to ACCESS-NRI/ACCESS-OM3 that referenced this pull request Jan 13, 2026
Testing updates of CDEPS, CMEPS and CESM_share. See PR `rc-2026.01.000`: ACCESS-NRI/access3-share#19
@anton-seaice
Copy link
Collaborator

See the CI failures here @chrisb13 - the added files in the submodules will need adding to the relevant CMakeLists

@chrisb13
Copy link
Contributor Author

chrisb13 commented Jan 13, 2026

Yeah, thanks @anton-seaice. I'm not sure what to do with some of the files. Let's look at an example.

In CDEPS/CDEPS I think we need to edit this file?

Then, going through the diff, we have the following new *.F90 files:

  1. dlnd/dlnd_datamode_glc_forcing_mod.F90

  2. dlnd/dlnd_datamode_rof_forcing_mod.F90

  3. docn/docn_datamode_multilev_cplhist_mod.F90

  4. share/shr_lnd2rof_tracers_mod.F90

So I think file number 3 can go here:

target_sources(ACCESS3_cdeps_docn PRIVATE
CDEPS/docn/docn_datamode_aquaplanet_mod.F90
CDEPS/docn/docn_datamode_copyall_mod.F90
CDEPS/docn/docn_datamode_cplhist_mod.F90
CDEPS/docn/docn_datamode_multilev_mod.F90
CDEPS/docn/docn_datamode_multilev_dom_mod.F90
CDEPS/docn/docn_datamode_iaf_mod.F90
CDEPS/docn/docn_datamode_som_mod.F90
CDEPS/docn/docn_import_data_mod.F90
CDEPS/docn/ocn_comp_nuopc.F90
)

But I don't see 1-2 and 4 go?

chrisb13 added a commit that referenced this pull request Jan 13, 2026
Adding the new file so that hopefully CESM_share will build. See @anton-seaice suggestion: #19 (comment)
chrisb13 added a commit to ACCESS-NRI/ACCESS-OM3 that referenced this pull request Jan 13, 2026
Reverting the access3-share commit because it's not ready yet (see ACCESS-NRI/access3-share#19 (comment))
@anton-seaice
Copy link
Collaborator

Yeah, thanks @anton-seaice. I'm not sure what to do with some of the files. Let's look at an example.

In CDEPS/CDEPS I think we need to edit this file?

...

So I think file number 3 can go here:

target_sources(ACCESS3_cdeps_docn PRIVATE
CDEPS/docn/docn_datamode_aquaplanet_mod.F90
CDEPS/docn/docn_datamode_copyall_mod.F90
CDEPS/docn/docn_datamode_cplhist_mod.F90
CDEPS/docn/docn_datamode_multilev_mod.F90
CDEPS/docn/docn_datamode_multilev_dom_mod.F90
CDEPS/docn/docn_datamode_iaf_mod.F90
CDEPS/docn/docn_datamode_som_mod.F90
CDEPS/docn/docn_import_data_mod.F90
CDEPS/docn/ocn_comp_nuopc.F90
)

Yep - sounds good.

But I don't see 1-2 and 4 go?

I think we might not need them (we don't build dlnd at this point)

@chrisb13
Copy link
Contributor Author

chrisb13 commented Jan 13, 2026

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?

chrisb13 added a commit that referenced this pull request Jan 13, 2026
Adding the new file so that hopefully CDEPS will build. See @anton-seaice comment: #19 (comment)
@anton-seaice
Copy link
Collaborator

  1. wtracers_mod.F90

Similarly for CMEPS, not sure where these two/nine should go:

1. [cesm/share_wrappers/wtracers_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-11b8a03a138a6bb8a3950fcacbb58d9ca32500694e4a0375d1c26db8c12381d0)

2. [ufs/wtracers_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-a27e57951bbf24b5b38cd901e2182cf945e6161c5f33550c92bb2ee3b6eade16)

Cmake file here.

The full list of modified files is:

1. [cesm/flux_atmocn/flux_atmocn_COARE_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-72025ee9bbfdee38272a1d74fb301f265a63577210087e6e284fb9ab8abb75aa)

2. [cesm/flux_atmocn/flux_atmocn_Diurnal_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-dad0313a90d82c44c5c9b28cf7d36e2e29b30738882cecb17534cbef7c36a0e5)

3. [cesm/flux_atmocn/flux_atmocn_Large.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-95349b1c278eef0c12dd2fb2baa6fbc7f8d08a11b3ca6d0538b7a53086db3c88)

4. [cesm/flux_atmocn/flux_atmocn_UA_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-06fe1c56df657d7b3795c0a1bf895c636910c25a5dfea4d98d0c6ae67bc76f30)

5. [cesm/flux_atmocn/flux_atmocn_driver_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-34726771285d2cd03d2f620772aa4d471ba69783f3b93f1083b828395740ccee)

6. [cesm/nuopc_cap_share/shr_lnd2rof_tracers_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-e705de7b456f1be0e1e2f8e675795a5d26b123c14ef2ef473eea4b0d378a454d)

7. [cesm/share_wrappers/wtracers_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-11b8a03a138a6bb8a3950fcacbb58d9ca32500694e4a0375d1c26db8c12381d0)

8. [mediator/med_field_info_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-f56e0b57500e246e31226e68798be67cba28cb200f01fa2b66ba72d4187346a2)

9. [ufs/wtracers_mod.F90](https://github.com/ESCOMP/CMEPS/compare/bd3ff83126516a16263fc7c4c16bbdeb4bd753b3...8d3ff3aff46a0072679649acd82337a85ccc3b2a#diff-a27e57951bbf24b5b38cd901e2182cf945e6161c5f33550c92bb2ee3b6eade16)

We hopefully don't need the files with ufs in the name.

For wtracers_mod it's used in med_field_info_mod, so in the ACCESS3_cmeps library is presumably ok

chrisb13 added a commit that referenced this pull request Jan 13, 2026
Adding the new file so that hopefully CESM_share will build. See @anton-seaice suggestion: #19 (comment)
chrisb13 added a commit that referenced this pull request Jan 13, 2026
Adding the new file so that hopefully CMEPS will build. See @anton-seaice suggestion: #19 (comment)
@chrisb13
Copy link
Contributor Author

H'm, none of them worked:

  1. 7a7c60b
  2. d04c67d
  3. 86a9f1a

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

@anton-seaice
Copy link
Collaborator

It appears to have progressed further.

From https://github.com/ACCESS-NRI/access3-share/actions/runs/20945603484/job/60187940655#step:14:4118

     506    Hunk #1 succeeded at 48 (offset 1 line).
  >> 507    Hunk #2 FAILED at 359.
     508    cd /tmp/root/spack-stage/spack-stage-access3-share-git.86a9f1a85468
            365d1510a310255d9fa8d7308354_stable-5lz4pkrinvk64jb7hw4r23firr2xb3s
            n/spack-build-5lz4pkr/CDEPS && /opt/spack/lib/spack/env/intel/ifort
             -DCESMCOUPLED -I/tmp/root/spack-stage/spack-stage-access3-share-gi
            t.86a9f1a85468365d1510a310255d9fa8d7308354_stable-5lz4pkrinvk64jb7h
            w4r23firr2xb3sn/spack-build-5lz4pkr/CDEPS/fox/include -I/tmp/root/s
            pack-stage/spack-stage-access3-share-git.86a9f1a85468365d1510a31025
            5d9fa8d7308354_stable-5lz4pkrinvk64jb7hw4r23firr2xb3sn/spack-build-
            5lz4pkr/CDEPS/mod/common -I/tmp/root/spack-stage/spack-stage-access
            3-share-git.86a9f1a85468365d1510a310255d9fa8d7308354_stable-5lz4pkr
            invk64jb7hw4r23firr2xb3sn/spack-build-5lz4pkr/share/mod/share -I/tm
            p/root/spack-stage/spack-stage-access3-share-git.86a9f1a85468365d15
            10a310255d9fa8d7308354_stable-5lz4pkrinvk64jb7hw4r23firr2xb3sn/spac
            k-src/share/CESM_share/include -I/opt/release/linux-rocky8-x86_64/i
            ntel-2021.10.0/esmf-8.7.0-xyfupzn55yzbfjolgnzrbc3mv624dqzs/include 
            -I/opt/release/linux-rocky8-x86_64/intel-2021.10.0/netcdf-c-4.9.2-t
            s47xluakjc3psv2vm4hpdhncv5ipknv/include -I/opt/release/linux-rocky8
            -x86_64/intel-2021.10.0/netcdf-fortran-4.6.1-ntkw64bap5aomszmiq5oqk
            a5s5ygikox/include -I/opt/release/linux-rocky8-x86_64/intel-2021.10
            .0/parallelio-2.6.2-zroyp3cinzvp66yjc3sblpapmxek5oub/include -I/opt
            /release/linux-rocky8-x86_64/intel-2021.10.0/openmpi-5.0.8-smuvndpt
            eb5outxxosvmggmspxq5gizk/include -I/opt/release/linux-rocky8-x86_64
            /intel-2021.10.0/openmpi-5.0.8-smuvndpteb5outxxosvmggmspxq5gizk/lib
             -qno-opt-dynamic-align  -convert big_endian -assume byterecl -ftz 
            -traceback -assume realloc_lhs -fp-model precise -O2 -debug minimal
             -module mod/dice -c /tmp/root/spack-stage/spack-stage-access3-shar
            e-git.86a9f1a85468365d1510a310255d9fa8d7308354_stable-5lz4pkrinvk64
            jb7hw4r23firr2xb3sn/spack-src/CDEPS/CDEPS/dice/dice_flux_atmice_mod
            .F90 -o CMakeFiles/ACCESS3_cdeps_dice.dir/CDEPS/dice/dice_flux_atmi
            ce_mod.F90.o
     509    Hunk #3 succeeded at 384 (offset 5 lines).
     510    Hunk #4 succeeded at 636 with fuzz 1 (offset 5 lines).
  >> 511    Hunk #5 FAILED at 656.
     512    Hunk #6 succeeded at 704 with fuzz 1 (offset 5 lines).
  >> 513    Hunk #7 FAILED at 730.
  >> 514    3 out of 7 hunks FAILED -- saving rejects to file /tmp/root/spack-s
            tage/spack-stage-access3-share-git.86a9f1a85468365d1510a310255d9fa8
            d7308354_stable-5lz4pkrinvk64jb7hw4r23firr2xb3sn/spack-build-5lz4pk
            r/CDEPS/atm_comp_nuopc.F90.rej
  >> 515    CMake Error at /tmp/root/spack-stage/spack-stage-access3-share-git.
            86a9f1a85468365d1510a310255d9fa8d7308354_stable-5lz4pkrinvk64jb7hw4
            r23firr2xb3sn/spack-src/cmake/PatchFile.cmake:32 (message):
     516      Failed to apply patch

It looks like whatever has changed upstream in atm_comp_nuopc.F90 is conflicting with the local patch applied in this repo for support the JRA55do forcing.

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.)

@chrisb13
Copy link
Contributor Author

Ah thanks. For book keeping, Hunks 2,5 and 7 failed, i.e.:

+ trim(datamode) == 'JRA55do' .or. &

- case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
+ case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')

- case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
+ case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')

@chrisb13
Copy link
Contributor Author

Okay, so just checked 848a5ae, and the commits in the repo align with the proposed ones for CMEPS, CDEPS and CESM_share.

chrisb13 added a commit to ACCESS-NRI/ACCESS-OM3 that referenced this pull request Jan 19, 2026
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
chrisb13 added a commit to ACCESS-NRI/ACCESS-OM3 that referenced this pull request Jan 21, 2026
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants