Corrected additional non-standard line indents

Corrected additional cases where the line indent pattern does not match the MOM6 standards, especially in some routines in MOM_open_boundary.F90, MOM_diag_mediator.F90, and MOM_ice_shelf related code. All answers are bitwise identical.
NOAA-GFDL · Dec 3, 2020 · 3f7d3cf · 3f7d3cf
1 parent 1267431
commit 3f7d3cf
Show file tree

Hide file tree

Showing 10 changed files with 1,703 additions and 1,711 deletions.
diff --git a/config_src/coupled_driver/ocean_model_MOM.F90 b/config_src/coupled_driver/ocean_model_MOM.F90
@@ -795,9 +795,9 @@ subroutine initialize_ocean_public_type(input_domain, Ocean_sfc, diag, maskmap,
   call mpp_get_layout(input_domain,layout)
   call mpp_get_global_domain(input_domain, xsize=xsz, ysize=ysz)
   if (PRESENT(maskmap)) then
-     call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain, maskmap=maskmap)
+    call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain, maskmap=maskmap)
   else
-     call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain)
+    call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain)
   endif
   call mpp_get_compute_domain(Ocean_sfc%Domain, isc, iec, jsc, jec)
 
@@ -1065,40 +1065,40 @@ subroutine ocean_model_data2D_get(OS, Ocean, name, array2D, isc, jsc)
 
 
   select case(name)
-  case('area')
-     array2D(isc:,jsc:) = OS%US%L_to_m**2*OS%grid%areaT(g_isc:g_iec,g_jsc:g_jec)
-  case('mask')
-     array2D(isc:,jsc:) = OS%grid%mask2dT(g_isc:g_iec,g_jsc:g_jec)
+    case('area')
+      array2D(isc:,jsc:) = OS%US%L_to_m**2*OS%grid%areaT(g_isc:g_iec,g_jsc:g_jec)
+    case('mask')
+      array2D(isc:,jsc:) = OS%grid%mask2dT(g_isc:g_iec,g_jsc:g_jec)
 !OR same result
 !     do j=g_jsc,g_jec ; do i=g_isc,g_iec
 !        array2D(isc+i-g_isc,jsc+j-g_jsc) = OS%grid%mask2dT(i,j)
 !     enddo ; enddo
-  case('t_surf')
-     array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
-  case('t_pme')
-     array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
-  case('t_runoff')
-     array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
-  case('t_calving')
-     array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
-  case('btfHeat')
-     array2D(isc:,jsc:) = 0
-  case('cos_rot')
-     array2D(isc:,jsc:) = OS%grid%cos_rot(g_isc:g_iec,g_jsc:g_jec) ! =1
-  case('sin_rot')
-     array2D(isc:,jsc:) = OS%grid%sin_rot(g_isc:g_iec,g_jsc:g_jec) ! =0
-  case('s_surf')
-     array2D(isc:,jsc:) = Ocean%s_surf(isc:,jsc:)
-  case('sea_lev')
-     array2D(isc:,jsc:) = Ocean%sea_lev(isc:,jsc:)
-  case('frazil')
-     array2D(isc:,jsc:) = Ocean%frazil(isc:,jsc:)
-  case('melt_pot')
-     array2D(isc:,jsc:) = Ocean%melt_potential(isc:,jsc:)
-  case('obld')
-     array2D(isc:,jsc:) = Ocean%OBLD(isc:,jsc:)
-  case default
-     call MOM_error(FATAL,'get_ocean_grid_data2D: unknown argument name='//name)
+    case('t_surf')
+      array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
+    case('t_pme')
+      array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
+    case('t_runoff')
+      array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
+    case('t_calving')
+      array2D(isc:,jsc:) = Ocean%t_surf(isc:,jsc:)-CELSIUS_KELVIN_OFFSET
+    case('btfHeat')
+      array2D(isc:,jsc:) = 0
+    case('cos_rot')
+      array2D(isc:,jsc:) = OS%grid%cos_rot(g_isc:g_iec,g_jsc:g_jec) ! =1
+    case('sin_rot')
+      array2D(isc:,jsc:) = OS%grid%sin_rot(g_isc:g_iec,g_jsc:g_jec) ! =0
+    case('s_surf')
+      array2D(isc:,jsc:) = Ocean%s_surf(isc:,jsc:)
+    case('sea_lev')
+      array2D(isc:,jsc:) = Ocean%sea_lev(isc:,jsc:)
+    case('frazil')
+      array2D(isc:,jsc:) = Ocean%frazil(isc:,jsc:)
+    case('melt_pot')
+      array2D(isc:,jsc:) = Ocean%melt_potential(isc:,jsc:)
+    case('obld')
+      array2D(isc:,jsc:) = Ocean%OBLD(isc:,jsc:)
+    case default
+      call MOM_error(FATAL,'get_ocean_grid_data2D: unknown argument name='//name)
   end select
 
 end subroutine ocean_model_data2D_get
@@ -1215,7 +1215,7 @@ subroutine ocean_model_get_UV_surf(OS, Ocean, name, array2D, isc, jsc)
                 0.5*(sfc_state%v(i+i0,J+j0)+sfc_state%v(i+i0+1,J+j0))
     enddo ; enddo
   case default
-     call MOM_error(FATAL,'ocean_model_get_UV_surf: unknown argument name='//name)
+    call MOM_error(FATAL,'ocean_model_get_UV_surf: unknown argument name='//name)
   end select
 
 end subroutine ocean_model_get_UV_surf

diff --git a/config_src/solo_driver/MESO_surface_forcing.F90 b/config_src/solo_driver/MESO_surface_forcing.F90
@@ -274,7 +274,7 @@ subroutine MESO_surface_forcing_init(Time, G, US, param_file, diag, CS)
     call get_param(param_file, mdl, "INPUTDIR", CS%inputdir, default=".")
     CS%inputdir = slasher(CS%inputdir)
 
-   endif
+  endif
 
 end subroutine MESO_surface_forcing_init
 

diff --git a/config_src/solo_driver/MOM_surface_forcing.F90 b/config_src/solo_driver/MOM_surface_forcing.F90
@@ -1240,7 +1240,7 @@ subroutine buoyancy_forcing_from_data_override(sfc_state, fluxes, day, dt, G, US
 
   ! note the sign convention
   do j=js,je ; do i=is,ie
-     fluxes%sens(i,j) = -US%W_m2_to_QRZ_T * fluxes%sens(i,j)  ! Normal convention is positive into the ocean
+    fluxes%sens(i,j) = -US%W_m2_to_QRZ_T * fluxes%sens(i,j)  ! Normal convention is positive into the ocean
                                            ! but sensible is normally a positive quantity in the files
   enddo ; enddo
 
@@ -1271,11 +1271,11 @@ subroutine buoyancy_forcing_from_data_override(sfc_state, fluxes, day, dt, G, US
 
 !     Read the SST and SSS fields for damping.
   if (CS%restorebuoy) then !#CTRL# .or. associated(CS%ctrl_forcing_CSp)) then
-     call data_override('OCN', 'SST_restore', CS%T_restore(:,:), day, &
-          is_in=is_in, ie_in=ie_in, js_in=js_in, je_in=je_in)
+    call data_override('OCN', 'SST_restore', CS%T_restore(:,:), day, &
+            is_in=is_in, ie_in=ie_in, js_in=js_in, je_in=je_in)
 
-     call data_override('OCN', 'SSS_restore', CS%S_restore(:,:), day, &
-          is_in=is_in, ie_in=ie_in, js_in=js_in, je_in=je_in)
+    call data_override('OCN', 'SSS_restore', CS%S_restore(:,:), day, &
+            is_in=is_in, ie_in=ie_in, js_in=js_in, je_in=je_in)
 
   endif
 

diff --git a/config_src/solo_driver/user_surface_forcing.F90 b/config_src/solo_driver/user_surface_forcing.F90
@@ -89,7 +89,7 @@ subroutine USER_wind_forcing(sfc_state, forces, day, G, US, CS)
   !  is always positive.
   if (associated(forces%ustar)) then ; do j=js,je ; do i=is,ie
     !  This expression can be changed if desired, but need not be.
-   forces%ustar(i,j) = G%mask2dT(i,j) * sqrt((CS%gust_const + &
+    forces%ustar(i,j) = G%mask2dT(i,j) * sqrt((CS%gust_const + &
             sqrt(0.5*(forces%taux(I-1,j)**2 + forces%taux(I,j)**2) + &
                  0.5*(forces%tauy(i,J-1)**2 + forces%tauy(i,J)**2))) * (US%L_to_Z/CS%Rho0))
   enddo ; enddo ; endif
-Original file line number
+Diff line change
@@ Expand Up @@
         call get_param(param_file, mdl, "INPUTDIR", CS%inputdir, default=".")
         CS%inputdir = slasher(CS%inputdir)
-       endif
+      endif
     end subroutine MESO_surface_forcing_init
@@ Expand Down @@