Skip to content

Commit 320a62f

Browse files
committed
Fix the syntax or substance in 10 comment units
Corrected incorrect syntax in the descriptions of 4 positions variables in write energy, 1 reused position variable in set_grid_metrics_from_mosaic and 1 position variable in bkgnd_mixing_CS. Also added the unscaled units to the comments documenting two lines of calculations in wave_speeds, and added the scaled units to two variables related to the ice-shelf surface mass balance. Only comments are changed and all answers are bitwise identical.
1 parent 69ba88d commit 320a62f

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

src/diagnostics/MOM_sum_output.F90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,14 +439,14 @@ subroutine write_energy(u, v, h, tv, day, n, G, GV, US, CS, tracer_CSp, dt_forci
439439
real :: T_min ! The global minimum unmasked value of the temperature [degC]
440440
real :: T_max ! The global maximum unmasked value of the temperature [degC]
441441
real :: T_min_x ! The x-positions of the global temperature minima
442-
! in the units of G%geoLonT, often [degreeT_E] or [km]
442+
! in the units of G%geoLonT, often [degrees_E] or [km]
443443
real :: T_min_y ! The y-positions of the global temperature minima
444-
! in the units of G%geoLatT, often [degreeT_N] or [km]
444+
! in the units of G%geoLatT, often [degrees_N] or [km]
445445
real :: T_min_z ! The z-positions of the global temperature minima [layer]
446446
real :: T_max_x ! The x-positions of the global temperature maxima
447-
! in the units of G%geoLonT, often [degreeT_E] or [km]
447+
! in the units of G%geoLonT, often [degrees_E] or [km]
448448
real :: T_max_y ! The y-positions of the global temperature maxima
449-
! in the units of G%geoLatT, often [degreeT_N] or [km]
449+
! in the units of G%geoLatT, often [degrees_N] or [km]
450450
real :: T_max_z ! The z-positions of the global temperature maxima [layer]
451451

452452

src/diagnostics/MOM_wave_speed.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,9 +1303,9 @@ subroutine wave_speeds(h, tv, G, GV, US, nmodes, cn, CS, w_struct, u_struct, u_s
13031303
! renormalization of the integral of the profile
13041304
w2avg = 0.0
13051305
do k=1,kc
1306-
w2avg = w2avg + 0.5*(mode_struct(K)**2+mode_struct(K+1)**2)*Hc(k) ! [H L4 T-4]
1306+
w2avg = w2avg + 0.5*(mode_struct(K)**2+mode_struct(K+1)**2)*Hc(k) ! [H L4 T-4 ~> m5 s-4 or kg m2 s-4]
13071307
enddo
1308-
renorm = sqrt(htot(i)*a_int/w2avg) ! [T2 L-2]
1308+
renorm = sqrt(htot(i)*a_int/w2avg) ! [T2 L-2 ~> s2 m-2]
13091309
do K=1,kc+1 ; mode_struct(K) = renorm * mode_struct(K) ; enddo
13101310
! after renorm, mode_struct is again [nondim]
13111311
if (abs(dlam) < tol_solve*lam_1) exit

src/ice_shelf/MOM_ice_shelf_initialize.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,11 +662,11 @@ end subroutine initialize_ice_AGlen
662662
subroutine initialize_ice_SMB(SMB, G, US, PF)
663663
type(ocean_grid_type), intent(in) :: G !< The ocean's grid structure
664664
real, dimension(SZDI_(G),SZDJ_(G)), &
665-
intent(inout) :: SMB !< Ice surface mass balance parameter, often in [kg m-2 s-1]
665+
intent(inout) :: SMB !< Ice surface mass balance parameter, often in [R Z T-1 ~> kg m-2 s-1]
666666
type(unit_scale_type), intent(in) :: US !< A structure containing unit conversion factors
667667
type(param_file_type), intent(in) :: PF !< A structure to parse for run-time parameters
668668

669-
real :: SMB_val ! Constant ice surface mass balance parameter, often in [kg m-2 s-1]
669+
real :: SMB_val ! Constant ice surface mass balance parameter, often in [R Z T-1 ~> kg m-2 s-1]
670670
character(len=40) :: mdl = "initialize_ice_SMB" ! This subroutine's name.
671671
character(len=200) :: config
672672
character(len=200) :: varname

src/initialization/MOM_grid_initialize.F90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ subroutine set_grid_metrics_from_mosaic(G, param_file, US)
175175
real, dimension(2*G%isd-2:2*G%ied+1,2*G%jsd-2:2*G%jed+1) :: tmpT ! Areas [L2 ~> m2]
176176
real, dimension(2*G%isd-3:2*G%ied+1,2*G%jsd-2:2*G%jed+1) :: tmpU ! East face supergrid spacing [L ~> m]
177177
real, dimension(2*G%isd-2:2*G%ied+1,2*G%jsd-3:2*G%jed+1) :: tmpV ! North face supergrid spacing [L ~> m]
178-
real, dimension(2*G%isd-3:2*G%ied+1,2*G%jsd-3:2*G%jed+1) :: tmpZ ! Corner latitudes or longitudes [degN] or [degE]
178+
real, dimension(2*G%isd-3:2*G%ied+1,2*G%jsd-3:2*G%jed+1) :: tmpZ ! Corner latitudes [degrees_N] or
179+
! longitudes [degrees_E]
179180
real, dimension(:,:), allocatable :: tmpGlbl ! A global array of axis labels [degrees_N] or [km] or [m]
180181
character(len=200) :: filename, grid_file, inputdir
181182
character(len=64) :: mdl = "MOM_grid_init set_grid_metrics_from_mosaic"

src/parameterizations/vertical/MOM_bkgnd_mixing.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module MOM_bkgnd_mixing
6060
!! twice the Earth's rotation period, used with the
6161
!! Henyey scaling from the mixing [nondim]
6262
real :: Henyey_max_lat !< A latitude poleward of which the Henyey profile
63-
!! is returned to the minimum diffusivity [degN]
63+
!! is returned to the minimum diffusivity [degrees_N]
6464
real :: prandtl_bkgnd !< Turbulent Prandtl number used to convert
6565
!! vertical background diffusivity into viscosity [nondim]
6666
real :: Kd_tanh_lat_scale !< A nondimensional scaling for the range of

0 commit comments

Comments
 (0)