Merge branch 'main' into develop

GEOS-ESM · Jan 29, 2024 · 040547d · 040547d
2 parents 1026735 + ea78b36
commit 040547d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.43.1] - 2024-01-29
+
+### Fixed
+
+- Added 0-size message to o-server root processes (fixes #2557)
+
 ## [2.43.0] - 2023-12-21
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.43.0
+  VERSION 2.43.1
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

diff --git a/pfio/MultiGroupServer.F90 b/pfio/MultiGroupServer.F90
@@ -367,7 +367,7 @@ subroutine receive_output_data(this, rc)
               call handle%wait()
               words = word_size(q%type_kind)
               local_size = product(q%count)*words
-              if (local_size > 0) then
+              if (local_size > 0 .or. this%I_am_front_root) then
                  collection_counter = this%stage_offset%at(i_to_string(q%collection_id))
                  call c_f_pointer(handle%data_reference%base_address, i_ptr, shape=[local_size])
                  call f_d_ms(collection_counter)%add_data_message(q, i_ptr)