Consolidation with CDI-PIO (1.8.x)
Loading
This is a consolidated version of the cdi-1.8.x
branch that is used in ICON and the master
branch of CDI-PIO
.
First, all automatically generated Autoconf files were removed from the master
branch of CDI-PIO to make conflict resolution easier. The only modification to the files that I noticed not to be exported as a patch file was this one. It's now a patch. @jahns, please, feel free to remove it if it's not needed anymore and add other ones that I missed and that are relevant.
The next step was to rebase the master
branch of CDI-PIO onto the cdi-1.8.x
branch and resolve conflicts. There might be things that I did wrong here but I would like to ask @jahns and @m214003 to review a couple of things:
At this point, the code passed all the tests from the test-suite, at least with gcc
and gfortran
.
The rest of the modifications should be trackable from the history but here is a short summary:
./autogen.sh
script) for Libtool that YAXT does;nc-config
in the PATH does not belong to the NetCDF library that is provided in the LIBS
, which is the case when CDI is configured as part of the ICON building process);--with-concurrent-mpi-checks
;make all
unless configured with --without-example-programs
and --with-on-demand-check-programs
, respectively;make check
);--enable-mpi
, e.g. always run pio_write_serial
and additionally run pio_write_parallel
(in the previous implementation, only one of the two was run, depending on whether MPI support was enabled);@k202125, could you please "protect" the cdi-1.8.x
and cdi-1.8.x-pio-merge
branches as follows:
Developers + Maintainers
Developers + Maintainers
disabled
.Everyone is welcome to introduce the required changes directly into cdi-1.8.x-pio-merge
. The plan is to merge the branch into cdi-1.8.x
once we get a "good to go" from DKRZ.
In the meantime, the Buildbot of ICON is green with cdi-1.8.x-pio-merge
(including MISTRAL_intel18_pio
, which was modified not to use an external installation of CDI-PIO, YAXT and PPM): https://gitlab.dkrz.de/icon/icon-cimd/-/merge_requests/32
Other people who might be interested in this: @k202082, @k202061, @m218027, @m300433.