Merge branch 'NOAA-GFDL:main' into cmake-updates

Author: rem1776

.github/workflows/github_autotools_intel.yml

@@ -8,9 +8,6 @@ concurrency:
 jobs:
   intel-autotools:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        io-flag: ["--disable-deprecated-io", "--enable-deprecated-io"]
     container:
       image: intel/oneapi-hpckit:2023.1.0-devel-ubuntu20.04
       env:
@@ -58,7 +55,7 @@ jobs:
       run: |
         autoreconf -if ./configure.ac
         export LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH"
-        ./configure --with-yaml ${{ matrix.io-flag }}
+        ./configure --with-yaml
     - name: Compile
       run: make -j || make
     - name: Run test suite

.github/workflows/github_cmake_gnu.yml

@@ -14,12 +14,11 @@ jobs:
       matrix:
         omp-flags: [ -DOPENMP=on, -DOPENMP=off ]
         libyaml-flag: [ "", -DWITH_YAML=on ]
-        io-flag: [ "", -DUSE_DEPRECATED_IO=on ]
         build-type: [ "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_BUILD_TYPE=Debug" ]
     container:
       image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:13.2.0
       env:
-        CMAKE_FLAGS: "${{ matrix.build-type }} ${{ matrix.omp-flags }} ${{ matrix.io-flag  }} ${{ matrix.libyaml-flag }} -D64BIT=on"
+        CMAKE_FLAGS: "${{ matrix.build-type }} ${{ matrix.omp-flags }} ${{ matrix.libyaml-flag }} -D64BIT=on"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4.2.2

CMakeLists.txt

@@ -65,7 +65,7 @@ option(PORTABLE_KINDS        "Enable compiler definition -DPORTABLE_KINDS"
 option(GFS_PHYS              "Enable compiler definition -DGFS_PHYS"              OFF)
 option(LARGEFILE             "Enable compiler definition -Duse_LARGEFILE"         OFF)
 option(WITH_YAML             "Enable compiler definition -Duse_yaml"              OFF)
-option(USE_DEPRECATED_IO     "Enable compiler definition -Duse_deprecated_io (compile with fms_io/mpp_io)"   OFF)
+option(USE_DEPRECATED_IO     "THIS OPTION HAS NO EFFECT AND WILL BE REMOVED IN A FUTURE RELEASE"   OFF)
 
 if(32BIT)
   list(APPEND kinds "r4")
@@ -103,7 +103,6 @@ list(APPEND fms_fortran_src_files
   affinity/fms_affinity.F90
   amip_interp/amip_interp.F90
   astronomy/astronomy.F90
-  axis_utils/axis_utils.F90
   axis_utils/axis_utils2.F90
   block_control/block_control.F90
   column_diagnostics/column_diagnostics.F90
@@ -151,7 +150,6 @@ list(APPEND fms_fortran_src_files
   field_manager/field_manager.F90
   field_manager/fm_util.F90
   field_manager/fm_yaml.F90
-  fms/fms_io.F90
   fms/fms.F90
   fms2_io/blackboxio.F90
   fms2_io/fms_io_utils.F90
@@ -176,7 +174,6 @@ list(APPEND fms_fortran_src_files
   mpp/mpp_data.F90
   mpp/mpp_domains.F90
   mpp/mpp_efp.F90
-  mpp/mpp_io.F90
   mpp/mpp_memutils.F90
   mpp/mpp_parameter.F90
   mpp/mpp_utilities.F90
@@ -188,7 +185,6 @@ list(APPEND fms_fortran_src_files
   sat_vapor_pres/sat_vapor_pres_k.F90
   sat_vapor_pres/sat_vapor_pres.F90
   string_utils/fms_string_utils.F90
-  time_interp/time_interp_external.F90
   time_interp/time_interp_external2.F90
   time_interp/time_interp.F90
   time_manager/get_cal_time.F90
@@ -256,9 +252,8 @@ if(WITH_YAML)
 endif()
 
 if(USE_DEPRECATED_IO)
-  message( WARNING "fms_io WILL BE DEPRECATED IN A FUTURE RELEASE. PLEASE UPDATE TO USE FMS2_IO AND REMOVE "
-                   "-DUSE_DEPRECATED_IO=on FROM YOUR OPTIONS")
-  list(APPEND fms_defs use_deprecated_io)
+  message( FATAL_ERROR "FMS_IO HAS BEEN REMOVED! PLEASE UPDATE TO USE FMS2_IO AND REMOVE  "
+                   "-DUSE_DEPRECATED_IO=on FROM YOUR OPTIONS OR REVERT TO VERSION 2025.02")
 endif()
 
 if(INTERNAL_FILE_NML)

README.md

@@ -1,4 +1,11 @@
-\page rm General Project Information
+# License Announcement
+
+FMS will switch to the
+[Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+with the 2025.04 or 2026.01 release.  Please refer to
+[issue 1683 on changing the license](https://github.com/NOAA-GFDL/FMS/issues/1683)
+to participate in or follow any dicussion on the topic.
+
 # Modeling Framework: Flexible Modeling System (FMS)
 
 Today’s climate models simulate highly complex systems. In response to

amip_interp/amip_interp.F90

@@ -156,9 +156,8 @@ module amip_interp_mod
 integer :: j_sst = 600
 real(r8_kind), parameter:: big_number = 1.E30_r8_kind
 logical :: forecast_mode = .false.
-real(r8_kind), allocatable, dimension(:,:) ::  sst_ncep, sst_anom
 
-public i_sst, j_sst, sst_ncep, sst_anom, forecast_mode, use_ncep_sst
+public i_sst, j_sst, forecast_mode, use_ncep_sst
 
 !-----------------------------------------------------------------------
 !--------------------- private below here ------------------------------
@@ -460,14 +459,6 @@ subroutine amip_interp_init
 !--- Added by SJL ----------------------------------------------
         if ( use_ncep_sst ) then
              mobs = i_sst;  nobs = j_sst
-            if (.not. allocated (sst_ncep)) then
-                allocate (sst_ncep(i_sst,j_sst))
-                sst_ncep(:,:) = big_number
-            endif
-            if (.not. allocated (sst_anom)) then
-                allocate (sst_anom(i_sst,j_sst))
-                sst_anom(:,:) = big_number
-            endif
         else
              mobs = 360;    nobs = 180
         endif

amip_interp/include/amip_interp.inc

@@ -114,9 +114,6 @@ if ( .not.use_daily ) then
               temp1(:,:) = temp2(:,:)   ! SJL BUG fix: June 24, 2011
           else
               call READ_RECORD_ ('sst', Date1, Udate1, temp1)
-              if ( use_ncep_sst .and. (.not. no_anom_sst) ) then
-                   temp1 = temp1 + SST_ANOM_
-              endif
               call horiz_interp ( Interp%Hintrp, temp1, Interp%DATA1_)
               call CLIP_DATA_ ('sst', Interp%DATA1_)
              Interp%Date1 = Date1
@@ -127,9 +124,6 @@ if ( .not.use_daily ) then
 
       if (Date2 /= Interp%Date2) then
           call READ_RECORD_ ('sst', Date2, Udate2, temp2)
-          if ( use_ncep_sst .and. (.not. no_anom_sst) ) then
-               temp2 = temp2 + SST_ANOM_
-          endif
           call horiz_interp ( Interp%Hintrp, temp2, Interp%DATA2_)
           call CLIP_DATA_ ('sst', Interp%DATA2_)
           Interp%Date2 = Date2
@@ -145,11 +139,6 @@ if ( .not.use_daily ) then
 !      Nudging runs: (Note: NCEP SST updated only every 6-hr)
 !      Compute SST anomaly from global SST datasets for subsequent forecast runs
 !-------------------------------------------------------------------------------
-    if ( use_ncep_sst .and. no_anom_sst ) then
-         sst_anom = SST_NCEP_ - (temp1 + fmonth*(temp2 - temp1))
-         call horiz_interp (Interp%Hintrp, SST_NCEP_, sst)
-         call CLIP_DATA_ ('sst', sst)
-    endif
 
 !! DEBUG CODE
     if (DEBUG) then
@@ -380,15 +369,7 @@ else
 !-- SJL -------------------------------------------------------------
 ! Can NOT use ncep_sst to determine sea_ice For seasonal forecast
 ! Use climo sea ice for seasonal runs
-            if ( use_ncep_sst .and. use_ncep_ice ) then
-               where ( SST_NCEP_ <= (real(TFREEZE, FMS_AMIP_INTERP_KIND_)+real(tice_crit, FMS_AMIP_INTERP_KIND_)) )
-                   sice = 1._lkind
-               elsewhere
-                   sice = 0._lkind
-               endwhere
-            else
-               call READ_RECORD_ ('ice', Date1, Udate1, sice)
-            endif
+            call READ_RECORD_ ('ice', Date1, Udate1, sice)
 !--------------------------------------------------------------------
             call horiz_interp ( Interp%Hintrp, sice, Interp%DATA1_)
             call CLIP_DATA_ ('ice', Interp%DATA1_)
@@ -401,15 +382,7 @@ else
     if (Date2 /= Interp%Date2) then
 
 !-- SJL -------------------------------------------------------------
-            if ( use_ncep_sst .and. use_ncep_ice ) then
-               where ( SST_NCEP_ <= (real(TFREEZE, FMS_AMIP_INTERP_KIND_)+real(tice_crit, FMS_AMIP_INTERP_KIND_)) )
-                   sice = 1._lkind
-               elsewhere
-                   sice = 0._lkind
-               endwhere
-            else
-               call READ_RECORD_ ('ice', Date2, Udate2, sice)
-            endif
+            call READ_RECORD_ ('ice', Date2, Udate2, sice)
 !--------------------------------------------------------------------
         call horiz_interp ( Interp%Hintrp, sice, Interp%DATA2_)
         call CLIP_DATA_ ('ice', Interp%DATA2_)

amip_interp/include/amip_interp_r4.fh

@@ -1,6 +1,4 @@
 #undef FMS_AMIP_INTERP_KIND_
-#undef SST_NCEP_
-#undef SST_ANOM_
 #undef LON_BND_
 #undef LAT_BND_
 #undef TEMPAMIP_
@@ -18,8 +16,6 @@
 #undef ZONAL_SST_
 
 #define FMS_AMIP_INTERP_KIND_ r4_kind
-#define SST_NCEP_ real(sst_ncep, r4_kind)
-#define SST_ANOM_ real(sst_anom, r4_kind)
 #define LON_BND_ real(lon_bnd, r4_kind)
 #define LAT_BND_ real(lat_bnd, r4_kind)
 #define TEMPAMIP_ real(tempamip, r4_kind)
@@ -39,8 +35,6 @@
 #include "amip_interp.inc"
 
 #undef FMS_AMIP_INTERP_KIND_
-#undef SST_NCEP_
-#undef SST_ANOM_
 #undef LON_BND_
 #undef LAT_BND_
 #undef TEMPAMIP_

amip_interp/include/amip_interp_r8.fh

@@ -1,6 +1,4 @@
 #undef FMS_AMIP_INTERP_KIND_
-#undef SST_NCEP_
-#undef SST_ANOM_
 #undef LON_BND_
 #undef LAT_BND_
 #undef TEMPAMIP_
@@ -18,8 +16,6 @@
 #undef ZONAL_SST_
 
 #define FMS_AMIP_INTERP_KIND_ r8_kind
-#define SST_NCEP_ sst_ncep
-#define SST_ANOM_ sst_anom
 #define LON_BND_ lon_bnd
 #define LAT_BND_ lat_bnd
 #define TEMPAMIP_ tempamip
@@ -39,8 +35,6 @@
 #include "amip_interp.inc"
 
 #undef FMS_AMIP_INTERP_KIND_
-#undef SST_NCEP_
-#undef SST_ANOM_
 #undef LON_BND_
 #undef LAT_BND_
 #undef TEMPAMIP_

axis_utils/Makefile.am

@@ -30,7 +30,6 @@ AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 noinst_LTLIBRARIES = libaxis_utils.la
 
 libaxis_utils_la_SOURCES = \
-  axis_utils.F90 \
   axis_utils2.F90 \
   include/axis_utils2_r4.fh \
   include/axis_utils2_r8.fh \
@@ -42,7 +41,7 @@ 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)
-BUILT_SOURCES = axis_utils_mod.$(FC_MODEXT) axis_utils2_mod.$(FC_MODEXT)
+nodist_include_HEADERS = axis_utils2_mod.$(FC_MODEXT)
+BUILT_SOURCES = axis_utils2_mod.$(FC_MODEXT)
 
 include $(top_srcdir)/mkmods.mk