Skip to content

Commit fb89b08

Browse files
Adds code that got lost during merge
Some code got that I added in MOM_state_initialization.F90 was lost during the merge with dev/master. This PR fixes that. * adds do_not_log=just_read * doxygenizes new variables * passes all MOM-examples/ocean_only tests on Cheyenne
1 parent 7480492 commit fb89b08

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

src/initialization/MOM_state_initialization.F90

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,14 +1795,14 @@ subroutine MOM_temp_salt_initialize_from_Z(h, tv, G, GV, PF, just_read_params)
17951795
logical, optional, intent(in) :: just_read_params !< If present and true, this call will
17961796
!! only read parameters without changing h.
17971797

1798-
character(len=200) :: filename ! The name of an input file containing temperature
1799-
! and salinity in z-space; also used for ice shelf area.
1800-
character(len=200) :: tfilename ! The name of an input file containing only temperature
1801-
! in z-space.
1802-
character(len=200) :: sfilename ! The name of an input file containing only salinity
1803-
! in z-space.
1804-
character(len=200) :: shelf_file ! The name of an input file used for ice shelf area.
1805-
character(len=200) :: inputdir ! The directory where NetCDF input filesare.
1798+
character(len=200) :: filename !< The name of an input file containing temperature
1799+
!! and salinity in z-space; also used for ice shelf area.
1800+
character(len=200) :: tfilename !< The name of an input file containing only temperature
1801+
!! in z-space.
1802+
character(len=200) :: sfilename !< The name of an input file containing only salinity
1803+
!! in z-space.
1804+
character(len=200) :: shelf_file !< The name of an input file used for ice shelf area.
1805+
character(len=200) :: inputdir !! The directory where NetCDF input filesare.
18061806
character(len=200) :: mesg, area_varname, ice_shelf_file
18071807

18081808
type(EOS_type), pointer :: eos => NULL()
@@ -1898,22 +1898,22 @@ subroutine MOM_temp_salt_initialize_from_Z(h, tv, G, GV, PF, just_read_params)
18981898
"The name of the z-space input file used to initialize \n"//&
18991899
"temperatures (T) and salinities (S). If T and S are not \n" //&
19001900
"in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE \n" //&
1901-
"must be set.",default="temp_salt_z.nc")
1901+
"must be set.",default="temp_salt_z.nc",do_not_log=just_read)
19021902
call get_param(PF, mdl, "TEMP_Z_INIT_FILE",tfilename, &
19031903
"The name of the z-space input file used to initialize \n"//&
1904-
"temperatures, only.", default=trim(filename))
1904+
"temperatures, only.", default=trim(filename),do_not_log=just_read)
19051905
call get_param(PF, mdl, "SALT_Z_INIT_FILE",sfilename, &
19061906
"The name of the z-space input file used to initialize \n"//&
1907-
"temperatures, only.", default=trim(filename))
1907+
"temperatures, only.", default=trim(filename),do_not_log=just_read)
19081908
filename = trim(inputdir)//trim(filename)
19091909
tfilename = trim(inputdir)//trim(tfilename)
19101910
sfilename = trim(inputdir)//trim(sfilename)
19111911
call get_param(PF, mdl, "Z_INIT_FILE_PTEMP_VAR", potemp_var, &
19121912
"The name of the potential temperature variable in \n"//&
1913-
"TEMP_Z_INIT_FILE.", default="ptemp")
1913+
"TEMP_Z_INIT_FILE.", default="ptemp",do_not_log=just_read)
19141914
call get_param(PF, mdl, "Z_INIT_FILE_SALT_VAR", salin_var, &
19151915
"The name of the salinity variable in \n"//&
1916-
"SALT_Z_INIT_FILE.", default="salt")
1916+
"SALT_Z_INIT_FILE.", default="salt",do_not_log=just_read)
19171917
call get_param(PF, mdl, "Z_INIT_HOMOGENIZE", homogenize, &
19181918
"If True, then horizontally homogenize the interpolated \n"//&
19191919
"initial conditions.", default=.false., do_not_log=just_read)

0 commit comments

Comments
 (0)