Skip to content

Commit

Permalink
Named argument assignment white-space clean-up
Browse files Browse the repository at this point in the history
  Removed extra white space around the named argument assignments for default,
units or conversion arguments to align with the MOM6 style guide.  Only white
space is modified, and all answers are bitwise identical.
  • Loading branch information
Hallberg-NOAA authored and marshallward committed Jan 18, 2023
1 parent 237194d commit 54b0701
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/core/MOM_dynamics_split_RK2.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1545,10 +1545,10 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
CS%id_PFv = register_diag_field('ocean_model', 'PFv', diag%axesCvL, Time, &
'Meridional Pressure Force Acceleration', 'm s-2', conversion=US%L_T2_to_m_s2)
CS%id_ueffA = register_diag_field('ocean_model', 'ueffA', diag%axesCuL, Time, &
'Effective U-Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective U-Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
y_cell_method='sum', v_extensive=.true.)
CS%id_veffA = register_diag_field('ocean_model', 'veffA', diag%axesCvL, Time, &
'Effective V-Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective V-Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
x_cell_method='sum', v_extensive=.true.)
if (GV%Boussinesq) then
CS%id_deta_dt = register_diag_field('ocean_model', 'deta_dt', diag%axesT1, Time, &
Expand Down
4 changes: 2 additions & 2 deletions src/core/MOM_dynamics_unsplit.F90
Original file line number Diff line number Diff line change
Expand Up @@ -692,10 +692,10 @@ subroutine initialize_dyn_unsplit(u, v, h, Time, G, GV, US, param_file, diag, CS
CS%id_PFv = register_diag_field('ocean_model', 'PFv', diag%axesCvL, Time, &
'Meridional Pressure Force Acceleration', 'm s-2', conversion=US%L_T2_to_m_s2)
CS%id_ueffA = register_diag_field('ocean_model', 'ueffA', diag%axesCuL, Time, &
'Effective U Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective U Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
y_cell_method='sum', v_extensive=.true.)
CS%id_veffA = register_diag_field('ocean_model', 'veffA', diag%axesCvL, Time, &
'Effective V Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective V Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
x_cell_method='sum', v_extensive=.true.)

id_clock_Cor = cpu_clock_id('(Ocean Coriolis & mom advection)', grain=CLOCK_MODULE)
Expand Down
4 changes: 2 additions & 2 deletions src/core/MOM_dynamics_unsplit_RK2.F90
Original file line number Diff line number Diff line change
Expand Up @@ -655,10 +655,10 @@ subroutine initialize_dyn_unsplit_RK2(u, v, h, Time, G, GV, US, param_file, diag
CS%id_PFv = register_diag_field('ocean_model', 'PFv', diag%axesCvL, Time, &
'Meridional Pressure Force Acceleration', 'meter second-2', conversion=US%L_T2_to_m_s2)
CS%id_ueffA = register_diag_field('ocean_model', 'ueffA', diag%axesCuL, Time, &
'Effective U-Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective U-Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
y_cell_method='sum', v_extensive=.true.)
CS%id_veffA = register_diag_field('ocean_model', 'veffA', diag%axesCvL, Time, &
'Effective V-Face Area', 'm^2', conversion = GV%H_to_m*US%L_to_m, &
'Effective V-Face Area', 'm^2', conversion=GV%H_to_m*US%L_to_m, &
x_cell_method='sum', v_extensive=.true.)

id_clock_Cor = cpu_clock_id('(Ocean Coriolis & mom advection)', grain=CLOCK_MODULE)
Expand Down
2 changes: 1 addition & 1 deletion src/core/MOM_verticalGrid.F90
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ subroutine verticalGridInit( param_file, GV, US )
log_to_all=.true., debugging=.true.)
call get_param(param_file, mdl, "G_EARTH", GV%g_Earth, &
"The gravitational acceleration of the Earth.", &
units="m s-2", default = 9.80, scale=US%Z_to_m*US%m_s_to_L_T**2)
units="m s-2", default=9.80, scale=US%Z_to_m*US%m_s_to_L_T**2)
call get_param(param_file, mdl, "RHO_0", GV%Rho0, &
"The mean ocean density used with BOUSSINESQ true to "//&
"calculate accelerations and the mass for conservation "//&
Expand Down
2 changes: 1 addition & 1 deletion src/framework/MOM_domains.F90
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ subroutine MOM_domains_init(MOM_dom, param_file, symmetric, static_memory, &
!$ if (.not.MOM_thread_affinity_set()) then
!$ call get_param(param_file, mdl, "OCEAN_OMP_THREADS", ocean_nthreads, &
!$ "The number of OpenMP threads that MOM6 will use.", &
!$ default = 1, layoutParam=.true.)
!$ default=1, layoutParam=.true.)
!$ call get_param(param_file, mdl, "OCEAN_OMP_HYPER_THREAD", ocean_omp_hyper_thread, &
!$ "If True, use hyper-threading.", default=.false., layoutParam=.true.)
!$ call set_MOM_thread_affinity(ocean_nthreads, ocean_omp_hyper_thread)
Expand Down
2 changes: 1 addition & 1 deletion src/ice_shelf/MOM_ice_shelf.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces_in,

call get_param(param_file, mdl, "G_EARTH", CS%g_Earth, &
"The gravitational acceleration of the Earth.", &
units="m s-2", default = 9.80, scale=US%m_s_to_L_T**2*US%Z_to_m)
units="m s-2", default=9.80, scale=US%m_s_to_L_T**2*US%Z_to_m)
call get_param(param_file, mdl, "C_P", CS%Cp, &
"The heat capacity of sea water, approximated as a constant. "//&
"The default value is from the TEOS-10 definition of conservative temperature.", &
Expand Down
2 changes: 1 addition & 1 deletion src/ice_shelf/MOM_ice_shelf_dynamics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ subroutine initialize_ice_shelf_dyn(param_file, Time, ISS, CS, G, US, diag, new_
fail_if_missing=.true.)
call get_param(param_file, mdl, "G_EARTH", CS%g_Earth, &
"The gravitational acceleration of the Earth.", &
units="m s-2", default = 9.80, scale=US%m_s_to_L_T**2*US%Z_to_m)
units="m s-2", default=9.80, scale=US%m_s_to_L_T**2*US%Z_to_m)

call get_param(param_file, mdl, "GLEN_EXPONENT", CS%n_glen, &
"nonlinearity exponent in Glen's Law", &
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/lateral/MOM_thickness_diffuse.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2040,7 +2040,7 @@ subroutine thickness_diffuse_init(Time, G, GV, US, param_file, diag, CDp, CS)
"is permitted for the thickness diffusivity. 1.0 is the "//&
"marginally unstable value in a pure layered model, but "//&
"much smaller numbers (e.g. 0.1) seem to work better for "//&
"ALE-based models.", units = "nondimensional", default=0.8)
"ALE-based models.", units="nondimensional", default=0.8)

call get_param(param_file, mdl, "KH_ETA_CONST", CS%Kh_eta_bg, &
"The background horizontal diffusivity of the interface heights (without "//&
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/lateral/MOM_tidal_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ subroutine tidal_forcing_init(Time, G, US, param_file, CS)
if (CS%tidal_sal_from_file .or. CS%use_prev_tides) then
call get_param(param_file, mdl, "TIDAL_INPUT_FILE", tidal_input_files, &
"A list of input files for tidal information.", &
default = "", fail_if_missing=.true.)
default="", fail_if_missing=.true.)
endif

call get_param(param_file, mdl, "TIDE_REF_DATE", tide_ref_date, &
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_CVMix_shear.F90
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ logical function CVMix_shear_init(Time, G, GV, US, param_file, diag, CS)
call get_param(param_file, mdl, "SMOOTH_RI", CS%smooth_ri, &
"If true, vertically smooth the Richardson "// &
"number by applying a 1-2-1 filter once.", &
default = .false.)
default=.false.)
call cvmix_init_shear(mix_scheme=CS%Mix_Scheme, &
KPP_nu_zero=US%Z2_T_to_m2_s*CS%Nu_Zero, &
KPP_Ri_zero=CS%Ri_zero, &
Expand Down
6 changes: 3 additions & 3 deletions src/tracer/MOM_neutral_diffusion.F90
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ logical function neutral_diffusion_init(Time, G, GV, US, param_file, diag, EOS,
call get_param(param_file, mdl, "NDIFF_REF_PRES", CS%ref_pres, &
"The reference pressure (Pa) used for the derivatives of "//&
"the equation of state. If negative (default), local pressure is used.", &
units="Pa", default = -1., scale=US%kg_m3_to_R*US%m_s_to_L_T**2)
units="Pa", default=-1., scale=US%kg_m3_to_R*US%m_s_to_L_T**2)
call get_param(param_file, mdl, "NDIFF_INTERIOR_ONLY", CS%interior_only, &
"If true, only applies neutral diffusion in the ocean interior."//&
"That is, the algorithm will exclude the surface and bottom"//&
Expand Down Expand Up @@ -245,10 +245,10 @@ logical function neutral_diffusion_init(Time, G, GV, US, param_file, diag, EOS,
call get_param(param_file, mdl, "NDIFF_DEBUG", CS%debug, &
"Turns on verbose output for discontinuous neutral "//&
"diffusion routines.", &
default = .false.)
default=.false.)
call get_param(param_file, mdl, "HARD_FAIL_HEFF", CS%hard_fail_heff, &
"Bring down the model if a problem with heff is detected",&
default = .true.)
default=.true.)
endif

if (CS%interior_only) then
Expand Down
2 changes: 1 addition & 1 deletion src/user/BFB_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ subroutine BFB_surface_forcing_init(Time, G, US, param_file, diag, CS)

call get_param(param_file, mdl, "G_EARTH", CS%G_Earth, &
"The gravitational acceleration of the Earth.", &
units="m s-2", default = 9.80, scale=US%m_to_L**2*US%Z_to_m*US%T_to_s**2)
units="m s-2", default=9.80, scale=US%m_to_L**2*US%Z_to_m*US%T_to_s**2)
call get_param(param_file, mdl, "RHO_0", CS%Rho0, &
"The mean ocean density used with BOUSSINESQ true to "//&
"calculate accelerations and the mass for conservation "//&
Expand Down
2 changes: 1 addition & 1 deletion src/user/circle_obcs_initialization.F90
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ subroutine circle_obcs_initialize_thickness(h, depth_tot, G, GV, param_file, jus
call get_param(param_file, mdl, "DISK_X_OFFSET", xOffset, &
"The x-offset of the initially elevated disk in the "//&
"circle_obcs test case.", units=G%x_ax_unit_short, &
default = 0.0, do_not_log=just_read)
default=0.0, do_not_log=just_read)
call get_param(param_file, mdl, "DISK_IC_AMPLITUDE", IC_amp, &
"Initial amplitude of interface height displacements "//&
"in the circle_obcs test case.", &
Expand Down
4 changes: 2 additions & 2 deletions src/user/dumbbell_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ subroutine dumbbell_surface_forcing_init(Time, G, US, param_file, diag, CS)

call get_param(param_file, mdl, "G_EARTH", CS%G_Earth, &
"The gravitational acceleration of the Earth.", &
units="m s-2", default = 9.80, scale=US%m_to_L**2*US%Z_to_m*US%T_to_s**2)
units="m s-2", default=9.80, scale=US%m_to_L**2*US%Z_to_m*US%T_to_s**2)
call get_param(param_file, mdl, "RHO_0", CS%Rho0, &
"The mean ocean density used with BOUSSINESQ true to "//&
"calculate accelerations and the mass for conservation "//&
Expand All @@ -210,7 +210,7 @@ subroutine dumbbell_surface_forcing_init(Time, G, US, param_file, diag, CS)
units="kg m-3", default=1035.0, scale=US%kg_m3_to_R)
call get_param(param_file, mdl, "DUMBBELL_SLP_AMP", CS%slp_amplitude, &
"Amplitude of SLP forcing in reservoirs.", &
units="Pa", default = 10000.0, scale=US%kg_m3_to_R*US%m_s_to_L_T**2)
units="Pa", default=10000.0, scale=US%kg_m3_to_R*US%m_s_to_L_T**2)
call get_param(param_file, mdl, "DUMBBELL_SLP_PERIOD", CS%slp_period, &
"Periodicity of SLP forcing in reservoirs.", &
units="days", default=1.0)
Expand Down

0 comments on commit 54b0701

Please sign in to comment.