Add fms2-io to MOM restart interfaces

.testing/Makefile

@@ -20,7 +20,7 @@ MKMF := $(abspath $(DEPS)/mkmf/bin/mkmf)
 
 # FMS framework
 FMS_URL ?= https://github.com/NOAA-GFDL/FMS.git
-FMS_COMMIT ?= 2019.01.03
+FMS_COMMIT ?= 2020.03-beta1
 FMS := $(DEPS)/fms
 
 #---

src/core/MOM.F90

@@ -2782,9 +2782,9 @@ subroutine finish_MOM_initialization(Time, dirs, CS, restart_CSp)
     call find_eta(CS%h, CS%tv, G, GV, US, z_interface, eta_to_m=1.0)
     call register_restart_field(z_interface, "eta", .true., restart_CSp_tmp, &
                                 "Interface heights", "meter", z_grid='i')
-
+    ! NOTE: write_ic=.true. routes routine to fms2 IO write_initial_conditions interface
     call save_restart(dirs%output_directory, Time, CS%G_in, &
-                      restart_CSp_tmp, filename=CS%IC_file, GV=GV)
+                      restart_CSp_tmp, filename=CS%IC_file, GV=GV, write_ic=.true.)
     deallocate(z_interface)
     deallocate(restart_CSp_tmp)
   endif

src/framework/MOM_string_functions.F90

@@ -17,6 +17,7 @@ module MOM_string_functions
 public extract_real
 public remove_spaces
 public slasher
+public append_substring
 
 contains
 
@@ -419,6 +420,34 @@ function slasher(dir)
   endif
 end function slasher
 
+!> append a string (substring) to another string (string_in) and return the
+!! concatenated string (string_out)
+function append_substring(string_in, substring) result(string_out)
+   character(len=*), intent(in) :: string_in !< input string
+   character(len=*), intent(in) :: substring !< string to append string_in
+   ! local
+   character(len=1024) :: string_out
+   character(len=1024) :: string_joined
+   integer :: string_in_length
+   integer :: substring_length
+
+   string_out = ''
+   string_joined = ''
+   string_in_length = 0
+   substring_length = 0
+
+   string_in_length = len_trim(string_in)
+   substring_length = len_trim(substring)
+
+   if (string_in_length > 0) then
+     if (substring_length > 0) then
+         string_joined = trim(string_in)//trim(substring)
+         string_out(1:len_trim(string_joined)) = trim(string_joined)
+     endif
+   endif
+
+end function append_substring
+
 !> \namespace mom_string_functions
 !!
 !!  By Alistair Adcroft and Robert Hallberg, last updated Sept. 2013.

src/ice_shelf/MOM_ice_shelf.F90

@@ -1512,8 +1512,8 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces, fl
   elseif (.not.new_sim) then
     ! This line calls a subroutine that reads the initial conditions from a restart file.
     call MOM_mesg("MOM_ice_shelf.F90, initialize_ice_shelf: Restoring ice shelf from file.")
-    call restore_state(dirs%input_filename, dirs%restart_input_dir, Time, &
-                       G, CS%restart_CSp)
+   call restore_state(dirs%input_filename, dirs%restart_input_dir, Time, &
+                      G, CS%restart_CSp)
 
     if ((US%m_to_Z_restart /= 0.0) .and. (US%m_to_Z_restart /= US%m_to_Z)) then
       Z_rescale = US%m_to_Z / US%m_to_Z_restart
@@ -1587,7 +1587,7 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces, fl
   if (save_IC .and. .not.((dirs%input_filename(1:1) == 'r') .and. &
                           (LEN_TRIM(dirs%input_filename) == 1))) then
     call save_restart(dirs%output_directory, CS%Time, G, &
-                      CS%restart_CSp, filename=IC_file)
+                      CS%restart_CSp, filename=IC_file, write_ic=.true.)
   endif