Merge branch 'dev/gfdl' of https://github.com/noaa-gfdl/mom6 into gfdl_cryo20260324

Author: OlgaSergienko

config_src/drivers/FMS_cap/MOM_surface_forcing_gfdl.F90

@@ -1211,7 +1211,7 @@ subroutine apply_flux_adjustments(G, US, CS, Time, fluxes)
   integer :: isc, iec, jsc, jec, i, j
   logical :: overrode_h
 
-  isc = G%isc; iec = G%iec ; jsc = G%jsc; jec = G%jec
+  isc = G%isc ; iec = G%iec ; jsc = G%jsc ; jec = G%jec
 
   call data_override(G%Domain, 'hflx_adj', temp_at_h, Time, override=overrode_h, &
                      scale=US%W_m2_to_QRZ_T)
@@ -1261,7 +1261,7 @@ subroutine apply_force_adjustments(G, US, CS, Time, forces)
   real :: zonal_tau, merid_tau ! True zonal and meridional wind stresses [R Z L T-2 ~> Pa]
   logical :: overrode_x, overrode_y
 
-  isc = G%isc; iec = G%iec ; jsc = G%jsc; jec = G%jec
+  isc = G%isc ; iec = G%iec ; jsc = G%jsc ; jec = G%jec
 
   tempx_at_h(:,:) = 0.0 ; tempy_at_h(:,:) = 0.0
   ! Either reads data or leaves contents unchanged
@@ -1464,11 +1464,11 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, wind_stagger)
                  "due to internal corrections.", default=.false.)
 
   if (present(wind_stagger)) then
-        if (wind_stagger == AGRID)    then ; stagger = 'AGRID'
+    if     (wind_stagger == AGRID)    then ; stagger = 'AGRID'
     elseif (wind_stagger == BGRID_NE) then ; stagger = 'BGRID_NE'
     elseif (wind_stagger == CGRID_NE) then ; stagger = 'CGRID_NE'
     else ; stagger = 'UNKNOWN' ; call MOM_error(FATAL,"surface_forcing_init: WIND_STAGGER = "// &
-                      trim(stagger)// "is invalid."); endif
+                      trim(stagger)// "is invalid.") ; endif
     call log_param(param_file, mdl, "WIND_STAGGER", stagger, &
                    "The staggering of the input wind stress field "//&
                    "from the coupler that is actually used.")
@@ -1478,7 +1478,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, wind_stagger)
                    "A case-insensitive character string to indicate the "//&
                    "staggering of the input wind stress field.  Valid "//&
                    "values are 'A', 'B', or 'C'.", default="C")
-        if (uppercase(stagger(1:1)) == 'A') then ; CS%wind_stagger = AGRID
+    if     (uppercase(stagger(1:1)) == 'A') then ; CS%wind_stagger = AGRID
     elseif (uppercase(stagger(1:1)) == 'B') then ; CS%wind_stagger = BGRID_NE
     elseif (uppercase(stagger(1:1)) == 'C') then ; CS%wind_stagger = CGRID_NE
     else ; call MOM_error(FATAL,"surface_forcing_init: WIND_STAGGER = "// &
@@ -1625,13 +1625,13 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, wind_stagger)
     utide_2d(:,:) = 0.0
     call read_netCDF_data(TideAmp_file, 'tideamp', utide_2d, G%Domain, &
         rescale=US%m_to_Z*US%T_to_s)
-    do j=jsd, jed; do i=isd, ied
+    do j=jsd,jed ; do i=isd,ied
       utide = utide_2d(i,j)
       CS%BBL_tidal_dis(i,j) = G%mask2dT(i,j)*rho_TKE_tidal*CS%cd_tides*(utide*utide*utide)
       CS%ustar_tidal(i,j) = sqrt(CS%cd_tides)*utide
     enddo ; enddo
   else
-    do j=jsd,jed; do i=isd,ied
+    do j=jsd,jed ; do i=isd,ied
       utide = CS%utide
       CS%BBL_tidal_dis(i,j) = rho_TKE_tidal*CS%cd_tides*(utide*utide*utide)
       CS%ustar_tidal(i,j) = sqrt(CS%cd_tides)*utide
@@ -1742,7 +1742,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, wind_stagger)
   if (CS%restore_salt) then
     salt_file = trim(CS%inputdir) // trim(CS%salt_restore_file)
     CS%srestore_handle = init_external_field(salt_file, CS%salt_restore_var_name, MOM_domain=G%Domain)
-    call safe_alloc_ptr(CS%srestore_mask,isd,ied,jsd,jed); CS%srestore_mask(:,:) = 1.0
+    call safe_alloc_ptr(CS%srestore_mask,isd,ied,jsd,jed) ; CS%srestore_mask(:,:) = 1.0
     if (CS%mask_srestore) then ! read a 2-d file containing a mask for restoring fluxes
       flnam = trim(CS%inputdir) // 'salt_restore_mask.nc'
       call MOM_read_data(flnam,'mask', CS%srestore_mask, G%domain, timelevel=1)
@@ -1752,7 +1752,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, wind_stagger)
   if (CS%restore_temp) then
     temp_file = trim(CS%inputdir) // trim(CS%temp_restore_file)
     CS%trestore_handle = init_external_field(temp_file, CS%temp_restore_var_name, MOM_domain=G%Domain)
-    call safe_alloc_ptr(CS%trestore_mask,isd,ied,jsd,jed); CS%trestore_mask(:,:) = 1.0
+    call safe_alloc_ptr(CS%trestore_mask,isd,ied,jsd,jed) ; CS%trestore_mask(:,:) = 1.0
     if (CS%mask_trestore) then  ! read a 2-d file containing a mask for restoring fluxes
       flnam = trim(CS%inputdir) // 'temp_restore_mask.nc'
       call MOM_read_data(flnam, 'mask', CS%trestore_mask, G%domain, timelevel=1)

config_src/drivers/FMS_cap/ocean_model_MOM.F90

@@ -284,7 +284,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, wind_stagger, gas
   OS%Time = Time_in ; OS%Time_dyn = Time_in
   ! Call initialize MOM with an optional Ice Shelf CS which, if present triggers
   ! initialization of ice shelf parameters and arrays.
-  point_calving=.false.; if (present(calve_ice_shelf_bergs)) point_calving=calve_ice_shelf_bergs
+  point_calving = .false. ; if (present(calve_ice_shelf_bergs)) point_calving = calve_ice_shelf_bergs
   call initialize_MOM(OS%Time, Time_init, param_file, OS%dirs, OS%MOM_CSp, &
                       Time_in, offline_tracer_mode=OS%offline_tracer_mode, &
                       diag_ptr=OS%diag, count_calls=.true., ice_shelf_CSp=OS%ice_shelf_CSp, &

config_src/drivers/STALE_mct_cap/mom_ocean_model_mct.F90

@@ -136,7 +136,7 @@ module MOM_ocean_model_mct
 !> The ocean_state_type contains all information about the state of the ocean,
 !! with a format that is private so it can be readily changed without disrupting
 !! other coupled components.
-type, public :: ocean_state_type ;
+type, public :: ocean_state_type
   ! This type is private, and can therefore vary between different ocean models.
   logical :: is_ocean_PE = .false.  !< True if this is an ocean PE.
   type(time_type) :: Time     !< The ocean model's time and master clock.

config_src/drivers/STALE_mct_cap/mom_surface_forcing_mct.F90

@@ -420,7 +420,7 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
   endif
 
   ! obtain fluxes from IOB; note the staggering of indices
-  i0 = 0; j0 = 0
+  i0 = 0 ; j0 = 0
   do j=js,je ; do i=is,ie
     ! liquid precipitation (rain)
     if (associated(IOB%lprec)) &
@@ -641,7 +641,7 @@ subroutine convert_IOB_to_forces(IOB, forces, index_bounds, Time, G, US, CS)
   IsdB = G%IsdB  ; IedB = G%IedB   ; JsdB = G%JsdB  ; JedB = G%JedB
   isr = is-isd+1 ; ier  = ie-isd+1 ; jsr = js-jsd+1 ; jer = je-jsd+1
  !i0 = is - isc_bnd ; j0 = js - jsc_bnd
-  i0 = 0; j0 = 0
+  i0 = 0 ; j0 = 0
 
   Irho0 = US%L_to_Z / CS%Rho0
   Pa_conversion = US%kg_m3_to_R*US%m_s_to_L_T**2*US%L_to_Z
@@ -899,7 +899,7 @@ subroutine apply_flux_adjustments(G, US, CS, Time, fluxes)
   integer :: isc, iec, jsc, jec, i, j
   logical :: overrode_h
 
-  isc = G%isc; iec = G%iec ; jsc = G%jsc; jec = G%jec
+  isc = G%isc ; iec = G%iec ; jsc = G%jsc ; jec = G%jec
 
   overrode_h = .false.
   call data_override('OCN', 'hflx_adj', temp_at_h(isc:iec,jsc:jec), Time, override=overrode_h)
@@ -949,7 +949,7 @@ subroutine apply_force_adjustments(G, US, CS, Time, forces)
   real :: Pa_conversion ! A unit conversion factor from Pa to the internal units [R Z L T-2 Pa-1 ~> 1]
   logical :: overrode_x, overrode_y
 
-  isc = G%isc; iec = G%iec ; jsc = G%jsc; jec = G%jec
+  isc = G%isc ; iec = G%iec ; jsc = G%jsc ; jec = G%jec
   Pa_conversion = US%kg_m3_to_R*US%m_s_to_L_T**2*US%L_to_Z
 
   tempx_at_h(:,:) = 0.0 ; tempy_at_h(:,:) = 0.0
@@ -1227,13 +1227,13 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, restore_salt,
   if (CS%read_TIDEAMP) then
     TideAmp_file = trim(CS%inputdir) // trim(TideAmp_file)
     call MOM_read_data(TideAmp_file,'tideamp',CS%TKE_tidal,G%domain,timelevel=1, scale=US%m_to_Z*US%T_to_s)
-    do j=jsd, jed; do i=isd, ied
+    do j=jsd,jed ; do i=isd,ied
       utide = CS%TKE_tidal(i,j)
       CS%TKE_tidal(i,j) = G%mask2dT(i,j)*CS%Rho0*CS%cd_tides*(utide*utide*utide)
       CS%ustar_tidal(i,j) = sqrt(CS%cd_tides)*utide
     enddo ; enddo
   else
-    do j=jsd,jed; do i=isd,ied
+    do j=jsd,jed ; do i=isd,ied
       utide = CS%utide
       CS%TKE_tidal(i,j) = CS%Rho0*CS%cd_tides*(utide*utide*utide)
       CS%ustar_tidal(i,j) = sqrt(CS%cd_tides)*utide
@@ -1327,7 +1327,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, restore_salt,
   if (present(restore_salt)) then ; if (restore_salt) then
     salt_file = trim(CS%inputdir) // trim(CS%salt_restore_file)
     CS%srestore_handle = init_external_field(salt_file, CS%salt_restore_var_name, domain=G%Domain%mpp_domain)
-    call safe_alloc_ptr(CS%srestore_mask,isd,ied,jsd,jed); CS%srestore_mask(:,:) = 1.0
+    call safe_alloc_ptr(CS%srestore_mask,isd,ied,jsd,jed) ; CS%srestore_mask(:,:) = 1.0
     if (CS%mask_srestore) then ! read a 2-d file containing a mask for restoring fluxes
       flnam = trim(CS%inputdir) // 'salt_restore_mask.nc'
       call MOM_read_data(flnam,'mask', CS%srestore_mask, G%domain, timelevel=1)
@@ -1337,7 +1337,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, restore_salt,
   if (present(restore_temp)) then ; if (restore_temp) then
     temp_file = trim(CS%inputdir) // trim(CS%temp_restore_file)
     CS%trestore_handle = init_external_field(temp_file, CS%temp_restore_var_name, domain=G%Domain%mpp_domain)
-    call safe_alloc_ptr(CS%trestore_mask,isd,ied,jsd,jed); CS%trestore_mask(:,:) = 1.0
+    call safe_alloc_ptr(CS%trestore_mask,isd,ied,jsd,jed) ; CS%trestore_mask(:,:) = 1.0
     if (CS%mask_trestore) then  ! read a 2-d file containing a mask for restoring fluxes
       flnam = trim(CS%inputdir) // 'temp_restore_mask.nc'
       call MOM_read_data(flnam, 'mask', CS%trestore_mask, G%domain, timelevel=1)
@@ -1403,7 +1403,7 @@ subroutine ice_ocn_bnd_type_chksum(id, timestep, iobt)
   chks = field_chksum( iobt%v_flux         ) ; if (root) write(outunit,100) 'iobt%v_flux          ', chks
   chks = field_chksum( iobt%t_flux         ) ; if (root) write(outunit,100) 'iobt%t_flux          ', chks
   chks = field_chksum( iobt%q_flux         ) ; if (root) write(outunit,100) 'iobt%q_flux          ', chks
-  chks = field_chksum( iobt%seaice_melt_heat); if (root) write(outunit,100) 'iobt%seaice_melt_heat', chks
+  chks = field_chksum( iobt%seaice_melt_heat) ; if (root) write(outunit,100) 'iobt%seaice_melt_heat', chks
   chks = field_chksum( iobt%seaice_melt)     ; if (root) write(outunit,100) 'iobt%seaice_melt    ', chks
   chks = field_chksum( iobt%salt_flux      ) ; if (root) write(outunit,100) 'iobt%salt_flux      ', chks
   chks = field_chksum( iobt%lw_flux        ) ; if (root) write(outunit,100) 'iobt%lw_flux        ', chks

config_src/drivers/STALE_mct_cap/ocn_cap_methods.F90

@@ -44,7 +44,7 @@ subroutine ocn_import(x2o, ind, grid, ice_ocean_boundary, ocean_public, logunit,
   character(*), parameter :: F01  = "('(ocn_import) ',a,4(i6,2x),d21.14)"
   !-----------------------------------------------------------------------
 
-  isc = GRID%isc; iec = GRID%iec ; jsc = GRID%jsc; jec = GRID%jec
+  isc = GRID%isc ; iec = GRID%iec ; jsc = GRID%jsc ; jec = GRID%jec
 
   k = 0
   do j = jsc, jec
@@ -236,7 +236,7 @@ subroutine ocn_export(ind, ocn_public, grid, o2x, dt_int, ncouple_per_day)
     endif
     sshx(i,j) = slope * grid%US%m_to_L*grid%IdxT(i,j) * grid%mask2dT(i,j)
     if (grid%mask2dT(i,j)==0.) sshx(i,j) = 0.0
-  enddo; enddo
+  enddo ; enddo
 
   ! d/dy ssh
   do j=grid%jsc, grid%jec ; do i=grid%isc,grid%iec
@@ -263,15 +263,15 @@ subroutine ocn_export(ind, ocn_public, grid, o2x, dt_int, ncouple_per_day)
     endif
     sshy(i,j) = slope * grid%US%m_to_L*grid%IdyT(i,j) * grid%mask2dT(i,j)
     if (grid%mask2dT(i,j)==0.) sshy(i,j) = 0.0
-  enddo; enddo
+  enddo ; enddo
 
   ! rotate ssh gradients from local coordinates to true zonal/meridional (inverse transformation)
   n = 0
   do j=grid%jsc, grid%jec ; do i=grid%isc,grid%iec
     n = n+1
     o2x(ind%o2x_So_dhdx, n) = grid%cos_rot(i,j) * sshx(i,j) + grid%sin_rot(i,j) * sshy(i,j)
     o2x(ind%o2x_So_dhdy, n) = grid%cos_rot(i,j) * sshy(i,j) - grid%sin_rot(i,j) * sshx(i,j)
-  enddo; enddo
+  enddo ; enddo
 
 end subroutine ocn_export
 

config_src/drivers/STALE_mct_cap/ocn_comp_mct.F90

@@ -61,7 +61,7 @@ module ocn_comp_mct
 use MOM_coupler_types,   only : coupler_type_initialized, coupler_type_copy_data
 
 ! By default make data private
-implicit none; private
+implicit none ; private
 
 #include <MOM_memory.h>
 
@@ -280,7 +280,7 @@ subroutine ocn_init_mct( EClock, cdata_o, x2o_o, o2x_o, NLFilename )
                   "Coeff. used to convert net shortwave rad. into "//&
                   "near-IR, diffuse shortwave.", units="nondim", default=0.215)
   else
-    glb%c1 = 0.0; glb%c2 = 0.0; glb%c3 = 0.0; glb%c4 = 0.0
+    glb%c1 = 0.0 ; glb%c2 = 0.0 ; glb%c3 = 0.0 ; glb%c4 = 0.0
   endif
 
   ! Close param file before it gets opened by ocean_model_init again.

config_src/drivers/ice_solo_driver/ice_shelf_driver.F90

@@ -205,11 +205,11 @@ program Shelf_main
     call close_file(unit)
   else
     calendar = uppercase(calendar)
-    if (calendar(1:6) == 'JULIAN') then ;        calendar_type = JULIAN
-    elseif (calendar(1:9) == 'GREGORIAN') then ; calendar_type = GREGORIAN
-    elseif (calendar(1:6) == 'NOLEAP') then ;    calendar_type = NOLEAP
-    elseif (calendar(1:10)=='THIRTY_DAY') then ; calendar_type = THIRTY_DAY_MONTHS
-    elseif (calendar(1:11)=='NO_CALENDAR') then; calendar_type = NO_CALENDAR
+    if (calendar(1:6) == 'JULIAN') then ;         calendar_type = JULIAN
+    elseif (calendar(1:9) == 'GREGORIAN') then ;  calendar_type = GREGORIAN
+    elseif (calendar(1:6) == 'NOLEAP') then ;     calendar_type = NOLEAP
+    elseif (calendar(1:10)=='THIRTY_DAY') then ;  calendar_type = THIRTY_DAY_MONTHS
+    elseif (calendar(1:11)=='NO_CALENDAR') then ; calendar_type = NO_CALENDAR
     elseif (calendar(1:1) /= ' ') then
       call MOM_error(FATAL,'Shelf_driver: Invalid namelist value '//trim(calendar)//' for calendar')
     else
@@ -220,8 +220,8 @@ program Shelf_main
 
 
   if (sum(date_init) > 0) then
-    Start_time = set_date(date_init(1),date_init(2), date_init(3), &
-         date_init(4),date_init(5),date_init(6))
+    Start_time = set_date(date_init(1), date_init(2), date_init(3), &
+                          date_init(4), date_init(5), date_init(6))
   else
     Start_time = real_to_time(0.0)
   endif

config_src/drivers/nuopc_cap/mom_cap.F90

@@ -103,7 +103,7 @@ module MOM_cap_mod
 #endif
 use mom_cap_profiling, only: cap_profiling_init, cap_profiling
 
-implicit none; private
+implicit none ; private
 
 public SetServices
 public SetVM

config_src/drivers/nuopc_cap/mom_cap_methods.F90

@@ -27,7 +27,7 @@ module MOM_cap_methods
 use mpp_domains_mod,           only: mpp_get_compute_domain
 
 ! By default make data private
-implicit none; private
+implicit none ; private
 
 ! Public member functions
 public :: mom_set_geomtype

config_src/drivers/nuopc_cap/mom_cap_outputlog.F90

@@ -7,7 +7,7 @@ module MOM_cap_outputlog
 
 #ifdef CESMCOUPLED
 use ESMF                  , only : ESMF_GridComp, ESMF_Clock, ESMF_SUCCESS
-implicit none; private
+implicit none ; private
 
 public :: outputlog_init, outputlog_run, outputlog_restart
 contains
@@ -45,7 +45,7 @@ end subroutine outputlog_restart
 use shr_is_restart_fh_mod , only : log_restart_fh
 use netcdf
 
-implicit none; private
+implicit none ; private
 
 public :: outputlog_init, outputlog_run, outputlog_restart