@@ -45,9 +45,9 @@ module MOM_tidal_forcing
4545 ! ! equilibrium tide. Set to false if providing tidal phases
4646 ! ! that have already been shifted by the
4747 ! ! astronomical/equilibrium argument.
48- real :: sal_scalar ! < The constant of proportionality between sea surface
49- ! ! height (really it should be bottom pressure) anomalies
50- ! ! and bottom geopotential anomalies [nondim].
48+ real :: sal_scalar = 0.0 ! < The constant of proportionality between self-attraction and
49+ ! ! loading (SAL) geopotential anomaly and total geopotential geopotential
50+ ! ! anomalies. This is only used if USE_PREVIOUS_TIDES is true. [nondim].
5151 integer :: nc ! < The number of tidal constituents in use.
5252 real , dimension (MAX_CONSTITUENTS) :: &
5353 freq, & ! < The frequency of a tidal constituent [rad T-1 ~> rad s-1].
@@ -267,7 +267,6 @@ subroutine tidal_forcing_init(Time, G, US, param_file, CS, HA_CS)
267267 character (len= 40 ) :: mdl = " MOM_tidal_forcing" ! This module's name.
268268 character (len= 128 ) :: mesg
269269 character (len= 200 ) :: tidal_input_files(4 * MAX_CONSTITUENTS)
270- real :: tide_sal_scalar_value ! The constant of proportionality with the scalar approximation to SAL [nondim]
271270 integer :: i, j, c, is, ie, js, je, isd, ied, jsd, jed, nc
272271
273272 is = G% isc ; ie = G% iec ; js = G% jsc ; je = G% jec
@@ -362,18 +361,13 @@ subroutine tidal_forcing_init(Time, G, US, param_file, CS, HA_CS)
362361 " If true, use the SAL from the previous iteration of the " // &
363362 " tides to facilitate convergent iteration. " // &
364363 " This is only used if TIDES is true." , default= .false. )
365- call get_param(param_file, ' ' , " TIDE_SAL_SCALAR_VALUE" , tide_sal_scalar_value, &
366- units= " m m-1" , default= 0.0 , do_not_log= .True. )
367- if (tide_sal_scalar_value/= 0.0 ) &
368- call MOM_error(WARNING, " TIDE_SAL_SCALAR_VALUE is a deprecated parameter. " // &
369- " Use SAL_SCALAR_VALUE instead." )
370- call get_param(param_file, mdl, " SAL_SCALAR_VALUE" , CS% sal_scalar, &
371- " The constant of proportionality between sea surface " // &
372- " height (really it should be bottom pressure) anomalies " // &
373- " and bottom geopotential anomalies. This is only used if " // &
374- " USE_SAL_SCALAR is true or USE_PREVIOUS_TIDES is true." , &
375- default= tide_sal_scalar_value, units= " m m-1" , &
376- do_not_log= (.not. CS% use_tidal_sal_prev))
364+ if (CS% use_tidal_sal_prev) &
365+ call get_param(param_file, mdl, " SAL_SCALAR_VALUE" , CS% sal_scalar, " The constant of " // &
366+ " proportionality between self-attraction and loading (SAL) geopotential " // &
367+ " anomaly and barotropic geopotential anomalies. This is only used if " // &
368+ " SAL_SCALAR_APPROX is true or USE_PREVIOUS_TIDES is true." , default= 0.0 , &
369+ units= " m m-1" , do_not_log= (.not. CS% use_tidal_sal_prev), &
370+ old_name= ' TIDE_SAL_SCALAR_VALUE' )
377371
378372 if (nc > MAX_CONSTITUENTS) then
379373 write (mesg,' ("Increase MAX_CONSTITUENTS in MOM_tidal_forcing.F90 to at least",I3, &
0 commit comments