Skip to content

Commit

Permalink
+Set defaults for WIND_CONFIG and BUOY_CONFIG
Browse files Browse the repository at this point in the history
  Set defaults for WIND_CONFIG and BUOY_CONFIG to "zero".  Because these had
previously been mandatory, all answers are bitwise identical in all cases, but
there are changes in the MOM_parameter_doc files.
  • Loading branch information
Hallberg-NOAA committed Jun 6, 2020
1 parent ef6a425 commit b364925
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config_src/ice_solo_driver/MOM_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, tracer_flow_C
call get_param(param_file, mdl, "BUOY_CONFIG", CS%buoy_config, &
"The character string that indicates how buoyancy forcing "//&
"is specified. Valid options include (file), (zero), "//&
"(linear), (USER), and (NONE).", fail_if_missing=.true.)
"(linear), (USER), and (NONE).", default="zero")
if (trim(CS%buoy_config) == "file") then
call get_param(param_file, mdl, "LONGWAVEDOWN_FILE", CS%longwavedown_file, &
"The file with the downward longwave heat flux, in "//&
Expand Down Expand Up @@ -1046,7 +1046,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, tracer_flow_C
call get_param(param_file, mdl, "WIND_CONFIG", CS%wind_config, &
"The character string that indicates how wind forcing "//&
"is specified. Valid options include (file), (2gyre), "//&
"(1gyre), (gyres), (zero), and (USER).", fail_if_missing=.true.)
"(1gyre), (gyres), (zero), and (USER).", default="zero")
if (trim(CS%wind_config) == "file") then
call get_param(param_file, mdl, "WIND_FILE", CS%wind_file, &
"The file in which the wind stresses are found in "//&
Expand Down
4 changes: 2 additions & 2 deletions config_src/solo_driver/MOM_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, tracer_flow_C
call get_param(param_file, mdl, "BUOY_CONFIG", CS%buoy_config, &
"The character string that indicates how buoyancy forcing "//&
"is specified. Valid options include (file), (zero), "//&
"(linear), (USER), (BFB) and (NONE).", fail_if_missing=.true.)
"(linear), (USER), (BFB) and (NONE).", default="zero")
if (trim(CS%buoy_config) == "file") then
call get_param(param_file, mdl, "ARCHAIC_OMIP_FORCING_FILE", CS%archaic_OMIP_file, &
"If true, use the forcing variable decomposition from "//&
Expand Down Expand Up @@ -1601,7 +1601,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, tracer_flow_C
call get_param(param_file, mdl, "WIND_CONFIG", CS%wind_config, &
"The character string that indicates how wind forcing "//&
"is specified. Valid options include (file), (2gyre), "//&
"(1gyre), (gyres), (zero), and (USER).", fail_if_missing=.true.)
"(1gyre), (gyres), (zero), and (USER).", default="zero")
if (trim(CS%wind_config) == "file") then
call get_param(param_file, mdl, "WIND_FILE", CS%wind_file, &
"The file in which the wind stresses are found in "//&
Expand Down

0 comments on commit b364925

Please sign in to comment.