Skip to content

Commit

Permalink
Merge pull request #2427 from GEOS-ESM/main
Browse files Browse the repository at this point in the history
Auto GitFlow - main → develop
  • Loading branch information
mathomp4 authored Oct 27, 2023
2 parents 521eda5 + 5a5eafb commit 56db614
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.41.2] - 2023-10-27

### Fixed

- Fixed missing initialize of pFlogger in a pfio test. Not clear why this was not failing for other compilers - detected with ifort 2021.10.0.

## [2.41.1] - 2023-10-04

### 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.41.1
VERSION 2.41.2
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the possible values of build type for cmake-gui
Expand Down
2 changes: 2 additions & 0 deletions pfio/tests/pfio_ctest_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ program main
use ctest_io_CLI
use MAPL_ExceptionHandling
use FakeHistData0Mod
use pFlogger, only: pflogger_init => initialize
implicit none

integer :: rank, npes, ierror, provided,required
Expand Down Expand Up @@ -533,6 +534,7 @@ program main
my_icomm = MPI_COMM_NULL
my_appcomm = MPI_COMM_NULL

call pflogger_init()
do i = 1, N_iclient_group
low_rank = client_start + (i-1) * options%npes_iserver
up_rank = client_start + i*options%npes_iserver
Expand Down
2 changes: 2 additions & 0 deletions pfio/tests/pfio_performance.F90
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ program main
use performace_CLI
use FakeHistDataMod
use MAPL_ExceptionHandling
use pFlogger, only: pflogger_init => initialize
implicit none

integer :: rank, npes, ierror
Expand All @@ -492,6 +493,7 @@ program main

call process_command_line(options, rc=status)

call pflogger_init()
directory_service = DirectoryService(MPI_COMM_WORLD)

my_icomm = MPI_COMM_NULL
Expand Down

0 comments on commit 56db614

Please sign in to comment.