Merge branch 'develop' into feature/mathomp4/add-release-builds

.circleci/config.yml

@@ -21,7 +21,7 @@ bcs_version: &bcs_version v11.6.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
 orbs:
-  ci: geos-esm/circleci-tools@dev:7b6720489f6be392a932159176d49313bb36a7a2
+  ci: geos-esm/circleci-tools@4
 
 workflows:
   build-and-test-MAPL:

CHANGELOG.md

@@ -9,38 +9,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+### Deprecated
+
+## [2.52.0] - 2025-01-17
+
+### Added
+
 - Added subroutine to read nc4 tile file
-- Added optional start_date and start_time to control the output window for each History collection. No output will be written before then. If not specified, these default to the beginning of the experiment.
-- Added utility to prepare inputs for ExtDatDriver.x so that ExtData can simulate a real GEOS run
+- Added optional `start_date` and `start_time` to control the output window for each History collection. No output will be written before then. If not specified, these default to the beginning of the experiment.
+- Added utility to prepare inputs for `ExtDataDriver.x` so that ExtData can simulate a real GEOS run
 - Added loggers when writing or reading weight files
 - Added new option to AGCM.rc `overwrite_checkpoint` to allow checkpoint files to be overwritten. By default still will not overwrite checkpoints
 - The trajectory sampler netCDF output variable `location_index_in_iodafile` can be turned off, after we add two control variables: `use_NWP_1_file` and `restore_2_obs_vector` for users.  When set to true, the two options will select only one obs file at each Epoch interval, and will rotate the output field index back to the location vector inthe obs file before generating netCDF output.
 - Support `splitfield: 1` in HISTORY.rc for trajectory sampler
 
 ### Changed
 
-- Changed MAPL_ESMFRegridder to require the dstMaskValues to be added as grid attribute to use fixed masking, fixes UFS issue
+- Changed `MAPL_ESMFRegridder` to require the dstMaskValues to be added as grid attribute to use fixed masking, fixes UFS issue
 - Increased formatting width of time index in ExtData2G diagnostic print
 - Updated GitHub checkout action to use blobless clones
 - Update CI to use Baselibs 7.29.0 by default
   - This provides ESMF 8.8.0
 - Update `components.yaml`
-  - ESMA_env v4.34.0
+  - `ESMA_env` v4.34.0
     - Update to MPT 2.30 at NAS
     - Update to Baselibs 7.29.0 (ESMF 8.8.0)
-  - ESMA_cmake v3.56.0
+  - `ESMA_cmake` v3.56.0
     - Use `LOCATION` Python `FIND_STRATEGY`
 
 ### Fixed
 
 - Free MPI communicators after reading and/or writing of restarts
-- Fixed the behavior of MAPL_MaxMin in presence of NaN
+- Fixed the behavior of `MAPL_MaxMin` in presence of NaN
 - Fixed bug with return codes and macros in udunits2f
 
-### Removed
-
-### Deprecated
-
 ## [2.51.2] - 2024-12-19
 
 ### Changed

CMakeLists.txt

@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.51.2
+  VERSION 2.52.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

base/NCIO.F90

@@ -5079,12 +5079,12 @@ function create_flipped_field(field,rc) result(flipped_field)
    end function create_flipped_field
 
    subroutine MAPL_ReadTilingNC4(File, GridName, im, jm, nx, ny, n_Grids, iTable, rTable, N_PfafCat, AVR,rc)
-      character(*),                        intent(IN)  :: File
-      character(*), optional,              intent(out) :: GridName(:)
-      integer,      optional,              intent(out) :: IM(:), JM(:)
-      integer,      optional,              intent(out) :: nx, ny, n_Grids
-      integer,      optional, allocatable, intent(out) :: iTable(:,:)
-      real(kind=8), optional, allocatable, intent(out) :: rTable(:,:)
+      character(*),                             intent(IN)  :: File
+      character(*), optional,                   intent(out) :: GridName(:)
+      integer,      optional,                   intent(out) :: IM(:), JM(:)
+      integer,      optional,                   intent(out) :: nx, ny, n_Grids
+      integer,      optional, allocatable,      intent(out) :: iTable(:,:)
+      real(kind=REAL64), optional, allocatable, intent(out) :: rTable(:,:)
       integer,      optional,              intent(out) :: N_PfafCat
       real,         optional, pointer,     intent(out) :: AVR(:,:)      ! used by GEOSgcm
       integer,      optional,              intent(out) :: rc
@@ -5098,11 +5098,11 @@ subroutine MAPL_ReadTilingNC4(File, GridName, im, jm, nx, ny, n_Grids, iTable, r
       class(*), pointer             :: attr_val(:)
       class(*), pointer             :: char_val
       integer, allocatable          :: tmp_int(:)
-      real(kind=8), allocatable     :: fr(:)
+      real(kind=REAL64),allocatable :: fr(:)
 
       integer            :: NumCol
       integer,      allocatable :: iTable_(:,:)
-      real(kind=8), allocatable :: rTable_(:,:)
+      real(kind=REAL64), allocatable :: rTable_(:,:)
 
       call formatter%open(File, pFIO_READ, rc=status)
       meta = formatter%read(rc=status)

base/tests/utCFIO_Array.F90

@@ -6,6 +6,7 @@
 
    Program utCFIO
 
+   use, intrinsic :: iso_fortran_env, only: REAL64
    use ESMF
 
    use MAPL_BaseMod
@@ -332,7 +333,7 @@ subroutine MAPL_GridGetLatLons ( grid, lons, lats )
 
     type(ESMF_Array)       :: eARRAY(2)
 
-    real(KIND=8), pointer  :: R8D2(:,:)
+    real(KIND=REAL64), pointer  :: R8D2(:,:)
     real, pointer          :: lons2d(:,:), lats2d(:,:)
     real, pointer          :: LONSLocal(:,:), LATSlocal(:,:)
     integer                :: IM_WORLD, JM_WORLD, dims(3)