Merge branch 'main' into stacksize

CHANGELOG.md

@@ -6,6 +6,21 @@ and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is releas
 `rr` is a sequential release number (starting from `01`), and an optional two-digit
 sequential patch number (starting from `01`).
 
+## [2023.01.01] - 2023-06-06
+### Changed
+- FMS2_IO: Performance changes for domain_reads_2d and domain_reads_3d:
+  - Root pe reads the data
+  - Uses mpp_scatter to send the data to the other pes
+  - Added unit tests to test all of the domain_read/domain_write interfaces
+
+- FMS2_IO: Performance changes for compressed_writes_1d/2d/3d
+  - Uses mpp_gather to get data for write
+  - Added unit tests to test all of the compressed writes interfaces
+  - Compressed_writes_4d/5d were unchanged
+
+- FMS2_IO: Extended mpp_scatter and mpp_gather to work for int8; added a kludge for scatter since the data is assumed to be (x,y,z)
+
+
 ## [2023.01] - 2023-04-03
 ### Known Issues
 - If using GCC 10 or higher as well as MPICH, compilation errors will occur unless `-fallow-argument-mismatch` is included in the Fortran compiler flags(the flag will now be added automatically if building with autotools or CMake).

CMakeLists.txt

@@ -295,12 +295,16 @@ foreach(kind ${kinds})
 
   target_include_directories(${libTgt}_f PRIVATE include
                                                  fms
+                                                 fms/include
                                                  fms2_io/include
                                                  string_utils/include
                                                  mpp/include
+                                                 sat_vapor_pres/include
+                                                 horiz_interp/include
                                                  diag_manager/include
                                                  constants4
-                                                 constants)
+                                                 constants
+                                                 axis_utils/include)
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
   target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
 
@@ -334,7 +338,10 @@ foreach(kind ${kinds})
   target_include_directories(${libTgt} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>)

amip_interp/amip_interp.F90

@@ -1353,7 +1353,10 @@ subroutine read_record (type, Date, Adate, dat)
      else
           call fms2_io_read_data(fileobj, ncfieldname, dat, unlim_dim_level=k)
      endif
-     idat =  nint(dat, I2_KIND) ! reconstruct packed data for reproducibility
+     !TODO This assumes that the data is "packed" (has the scale_factor and add_offset attributes)
+     ! in fms2_io_read_data the data is unpacked (data_in_file*scale_factor + add_offset)
+     ! the line below "packs" the data again. This is needed for reproducibility
+     idat =  nint(dat*100., I2_KIND)
 
    !---- unpacking of data ----
 

axis_utils/Makefile.am

@@ -23,15 +23,23 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/axis_utils/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libaxis_utils.la
 
 libaxis_utils_la_SOURCES = \
   axis_utils.F90 \
-  axis_utils2.F90
+  axis_utils2.F90 \
+  include/axis_utils2_r4.fh \
+  include/axis_utils2_r8.fh \
+  include/axis_utils2.inc
+
+axis_utils2.$(FC_MODEXT) : \
+include/axis_utils2_r4.fh \
+include/axis_utils2_r8.fh \
+include/axis_utils2.inc
 
 # Mod file depends on its o file, is built and then installed.
 nodist_include_HEADERS = axis_utils_mod.$(FC_MODEXT) axis_utils2_mod.$(FC_MODEXT)