Merge tag '2023.04' into update-block-control

.github/workflows/github_autotools_gnu.yml

@@ -4,6 +4,11 @@ name: Build libFMS test with autotools
 
 on: [push, pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,7 +27,7 @@ jobs:
         SKIP_TESTS: "test_yaml_parser.5" # temporary till fixes are in
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare GNU autoconf for build
       run: autoreconf -if
     - name: Configure the build

.github/workflows/github_autotools_intel.yml

@@ -1,4 +1,10 @@
 on: pull_request
+
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   intel-autotools:
     runs-on: ubuntu-latest
@@ -47,7 +53,7 @@ jobs:
         ./configure --prefix=/libs
         make -j install && cd
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Configure
       run: autoreconf -if ./configure.ac && ./configure --with-yaml
     - name: Compile

.github/workflows/github_cmake_gnu.yml

@@ -2,6 +2,11 @@ name: Build libFMS with cmake
 
 on: [push, pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,7 +21,7 @@ jobs:
         CMAKE_FLAGS: "${{ matrix.omp-flags }} ${{ matrix.io-flag  }} ${{ matrix.libyaml-flag }} -D64BIT=on"
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Generate makefiles with CMake
       run: cmake $CMAKE_FLAGS .
     - name: Build the library

.github/workflows/github_coupler_gnu.yml

@@ -1,6 +1,11 @@
 name: Test coupler build
 on: [pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   coupler-build:
     runs-on: ubuntu-latest
@@ -17,11 +22,11 @@ jobs:
         LDFLAGS: '-L/opt/view/lib'
     steps:
     - name: Checkout FMS
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: FMS
     - name: Checkout FMScoupler
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: 'NOAA-GFDL/FMScoupler'
         path: FMScoupler

.github/workflows/github_doc_site.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup repo
         run: | # do autotool's job for substitutes since we don't need a full build environement
           mkdir gen_docs

.github/workflows/github_linter.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run Lint
         uses: NOAA-GFDL/simple_lint@f5aa1fe976bd4c231db0536ba00cbfdc26708253
         with:

.github/workflows/version.yml

@@ -7,7 +7,7 @@ jobs:
   add-dev-to-version:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Append version with dev
       run: sed -i '/20[0-9][0-9]\.[0-9][0-9]/ s/]/-dev]/' configure.ac
     - name: Create pull request

CHANGELOG.md

@@ -6,6 +6,26 @@ 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.04] - 2023-12-04
+### Known Issues
+- GCC 9 and below as well as GCC 11.1.0 are unsupported due to compilation issues. See prior releases for more details.
+- `NO_QUAD_PRECISION` macro is no longer set by FMS, the `ENABLE_QUAD_PRECISION` macro has replaced prior usage of `NO_QUAD_PRECISION`. `-DENABLE_QUAD_PRECISION` should be set if quad precision is to be used, otherwise FMS will not use quad precision reals where applicable.
+
+### Added
+- DATA_OVERRIDE: A new namelist flag `use_data_table_yaml` has been added to enable usage of the yaml format data_override tables. This allows an executable built with yaml support be able to accept either format.
+
+### Changed
+- RESERVED KEYWORD CHANGES: Various routines in FMS have been updated to not use fortran keywords for variable names. The names changed were: `data`, `unit`, and `value`. This may affect usage of external code if argument names are explicitly used. Only required arguement names were changed to mitigate any breaking changes.
+- TESTS: Changes the testing scripts to allow for the `MPI_LAUNCHER` environment variable override to work with any provided arguments.
+
+### Fixed
+- CMAKE: Fixed build issue with CMake where precision default flags were being overwritten when using GNU and MPICH.
+- AUTOTOOLS: Fixes issue affecting installs where the global libFMS.F90 module was not being installed correctly and adds post-install message.
+- DIAG_MANAGER: Fixes issue with incorrect start_time functionality (from the 2023.02.01 patch)
+
+### Tag Commit Hashes
+- 2023.04-beta1 be1856c45accfe2fb15953c5f51e0d58a8816882
+
 ## [2023.03] - 2023-10-27
 ### Known Issues
 - GCC 9 and below as well as GCC 11.1.0 are unsupported due to compilation issues. See prior releases for more details.
@@ -42,6 +62,12 @@ sequential patch number (starting from `01`).
 - 2023.03-alpha2 9983ce308e62e9f7215b04c227cebd30fd75e784
 - 2023.03-alpha1 a46bd94fd8dd1f6f021501e29179003ff28180ec
 
+
+## [2023.02.01] - 2023-10-13
+### Fixed
+- DIAG_MANAGER: Fixes issue with incorrect start_time functionality
+
+
 ## [2023.02] - 2023-07-27
 ### Known Issues
 - GCC 11.1.0 is unsupported due to compilation issues with select type. The issue is resolved in later GCC releases.

CMakeLists.txt

@@ -26,7 +26,7 @@ set(CMAKE_Fortran_FLAGS_DEBUG)
 
 # Define the CMake project
 project(FMS
-  VERSION 2023.03.0
+  VERSION 2023.04.0
   DESCRIPTION  "GFDL FMS Library"
   HOMEPAGE_URL "https://www.gfdl.noaa.gov/fms"
   LANGUAGES C Fortran)
@@ -349,7 +349,7 @@ foreach(kind ${kinds})
   if ( CMAKE_Fortran_COMPILER_VERSION MATCHES "1[0-9]\.[0-9]*\.[0-9]*" AND CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     if(MPI_C_COMPILER MATCHES ".*mpich.*" )
       message(STATUS "Adding -fallow-argument-mismatch flag to compile with GCC >=10 and MPICH")
-      set_target_properties(${libTgt}_f PROPERTIES COMPILE_FLAGS "-fallow-argument-mismatch -w")
+      target_compile_options(${libTgt}_f PRIVATE "-fallow-argument-mismatch;-w")
     endif()
   endif()
 

Makefile.am

@@ -79,15 +79,15 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = FMS.pc
 
 ## Build libFMS module
-AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/mpp/include
+AM_CPPFLAGS = -I${top_srcdir}/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 noinst_LTLIBRARIES = libFMS_mod.la
 libFMS_mod_la_SOURCES = libFMS.F90
 
 fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)
 
-nodist_include_HEADERS = libFMS_mod.la
+nodist_include_HEADERS = .mods/fms.$(FC_MODEXT)
 
 include $(top_srcdir)/mkmods.mk
 
@@ -130,3 +130,20 @@ else
 clean-local:
 	-rm -rf .mods
 endif
+
+install-data-hook:
+	@echo ''
+	@echo '+-------------------------------------------------------------+'
+	@echo '| Congratulations! You have successfully installed the FMS    |'
+	@echo '| Fortran library.                                            |'
+	@echo '|                                                             |'
+	@echo '| After the installed include and link paths have been        |'
+	@echo '| specified, code using FMS should be compiled using the      |'
+	@echo '| "-lFMS" flag.                                               |'
+	@echo '|                                                             |'
+	@echo '| FMS is developed and maintained at the GFDL publicly on     |'
+	@echo '| Github. To report an issue or view available documentation, |'
+	@echo '| please see our page: https://www.github.com/NOAA-GFDL/FMS   |'
+	@echo '+-------------------------------------------------------------+'
+	@echo ''
+

affinity/fms_affinity.F90

@@ -91,7 +91,7 @@ subroutine fms_affinity_init()
     !--- local variables
     integer:: io_stat
     integer:: ierr
-    integer:: unit
+    integer:: iunit
 
     !--- return if module is initialized
     if (module_is_initialized) return
@@ -105,8 +105,8 @@ subroutine fms_affinity_init()
 
     !--- output information to logfile
     call write_version_number("fms_affinity_mod", version)
-    unit = stdlog()
-    write(unit,nml=fms_affinity_nml)
+    iunit = stdlog()
+    write(iunit,nml=fms_affinity_nml)
 
     module_is_initialized = .TRUE.
 

amip_interp/amip_interp.F90

@@ -303,7 +303,7 @@ module amip_interp_mod
 !  ---- global unit & date ----
 
    integer, parameter :: maxc = 128
-   integer :: unit
+   integer :: iunit
    character(len=maxc) :: file_name_sst, file_name_ice
    type(FmsNetcdfFile_t), target :: fileobj_sst, fileobj_ice
 
@@ -367,7 +367,7 @@ module amip_interp_mod
 
  !> initialize @ref amip_interp_mod for use
  subroutine amip_interp_init
-   integer :: unit,io,ierr
+   integer :: iunit,io,ierr
 
 !-----------------------------------------------------------------------
 
@@ -381,9 +381,9 @@ subroutine amip_interp_init
 !  ----- write namelist/version info -----
     call write_version_number("AMIP_INTERP_MOD", version)
 
-    unit = stdlog ( )
+    iunit = stdlog ( )
     if (mpp_pe() == 0) then
-        write (unit,nml=amip_interp_nml)
+        write (iunit,nml=amip_interp_nml)
     endif
 
     if (use_mpp_io) then

amip_interp/include/amip_interp.inc

@@ -52,7 +52,7 @@ subroutine GET_AMIP_SST_ (Time, Interp, sst, err_msg, lon_model, lat_model)
 ! end add by JHC
     logical, parameter :: DEBUG = .false. !> switch for debugging output
     !> These are fms_io specific
-    integer :: unit
+    integer :: iunit
     integer, parameter :: lkind = FMS_AMIP_INTERP_KIND_
 
     if(present(err_msg)) err_msg = ''
@@ -103,7 +103,7 @@ if ( .not.use_daily ) then
      Date2 = date_type( year2, month2, 0 )
 
 !  -- open/rewind file --
-     unit = -1
+     iunit = -1
 !-----------------------------------------------------------------------
 
       if (Date1 /= Interp%Date1) then
@@ -368,7 +368,7 @@ else
    Date1 = date_type( year1, month1, 0 )
    Date2 = date_type( year2, month2, 0 )
 
-   unit = -1
+   iunit = -1
 !-----------------------------------------------------------------------
 
     if (Date1 /= Interp%Date1) then

astronomy/astronomy.F90

@@ -437,7 +437,7 @@ subroutine astronomy_init (latb, lonb)
 !-------------------------------------------------------------------
 !  local variables:
 !-------------------------------------------------------------------
-integer :: unit, ierr, io, seconds, days, jd, id
+integer :: iunit, ierr, io, seconds, days, jd, id
 character(len=17) :: err_str
 
 !-------------------------------------------------------------------
@@ -463,8 +463,8 @@ subroutine astronomy_init (latb, lonb)
 !---------------------------------------------------------------------
     call write_version_number("ASTRONOMY_MOD", version)
     if (mpp_pe() == mpp_root_pe() ) then
-       unit = stdlog()
-       write (unit, nml=astronomy_nml)
+       iunit = stdlog()
+       write (iunit, nml=astronomy_nml)
     endif
 !--------------------------------------------------------------------
 !>    Be sure input values are within valid ranges.