Skip to content

Commit

Permalink
Add Ubuntu24 fixes, prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 committed Dec 18, 2024
1 parent 4c07622 commit d8b97a9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:
default: ""

# Anchors to prevent forgetting to update a version
os_version: &os_version ubuntu20
os_version: &os_version ubuntu24
baselibs_version: &baselibs_version v7.27.0
bcs_version: &bcs_version v11.6.0
tag_build_arg_name: &tag_build_arg_name maplversion
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
name: Build and Test MAPL GNU
runs-on: ubuntu-latest
container:
image: gmao/ubuntu20-geos-env-mkl:v7.27.0-openmpi_5.0.5-gcc_14.2.0
image: gmao/ubuntu24-geos-env-mkl:v7.27.0-openmpi_5.0.5-gcc_14.2.0
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
# It seems like we might not need secrets on GitHub Actions which is good for forked
# pull requests
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
name: Build and Test MAPL Intel
runs-on: ubuntu-latest
container:
image: gmao/ubuntu20-geos-env:v7.27.0-intelmpi_2021.13-ifort_2021.13
image: gmao/ubuntu24-geos-env:v7.27.0-intelmpi_2021.13-ifort_2021.13
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
# It seems like we might not need secrets on GitHub Actions which is good for forked
# pull requests
Expand Down
16 changes: 12 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Removed restrction that vector regridding in ExtData2G must be bilinear

### Fixed

- Fixed by when using multiple rules for a vector item in ExtData2G

### Removed

### Deprecated

## [2.51.2] - 2024-12-19

### Changed

- Removed restriction that vector regridding in ExtData2G must be bilinear
- Update CI to use Ubuntu 24 images

### Fixed

- Fixed by when using multiple rules for a vector item in ExtData2G
- Fix profiler ExclusiveColumn test for GCC 14

## [2.51.1] - 2024-12-10

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif ()

project (
MAPL
VERSION 2.51.1
VERSION 2.51.2
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the possible values of build type for cmake-gui
Expand Down
10 changes: 5 additions & 5 deletions profiler/tests/test_ExclusiveColumn.pf
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ contains
class(AbstractMeterNode), pointer :: subnode
class(AbstractMeter), pointer :: t
type(ExclusiveColumn) :: c
type(UnlimitedVector) :: v
type(UnlimitedVector), target :: v
integer :: i
integer :: expected(3)
class(*), allocatable :: q
class(*), pointer :: q

node = MeterNode('top', AdvancedMeter(MpiTimerGauge()))
t => node%get_meter()
call t%add_cycle(10.0d0)

call node%add_child('a', AdvancedMeter(MpiTimerGauge()))
subnode => node%get_child('a')
t => subnode%get_meter()
Expand All @@ -33,7 +33,7 @@ contains
v = c%get_rows(node)
expected = [7,1,2]
do i = 1, 3
q = v%at(i)
q => v%at(i)
select type (q)
type is (integer)
@assertEqual(expected(i), q)
Expand Down

0 comments on commit d8b97a9

Please sign in to comment.