From b3649255c0d84cb6ea0f0a6821d5d17d0ee50f75 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Sat, 6 Jun 2020 08:55:40 -0400 Subject: [PATCH] +Set defaults for WIND_CONFIG and BUOY_CONFIG 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. --- config_src/ice_solo_driver/MOM_surface_forcing.F90 | 4 ++-- config_src/solo_driver/MOM_surface_forcing.F90 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config_src/ice_solo_driver/MOM_surface_forcing.F90 b/config_src/ice_solo_driver/MOM_surface_forcing.F90 index 80e5d22324..292bc65b18 100644 --- a/config_src/ice_solo_driver/MOM_surface_forcing.F90 +++ b/config_src/ice_solo_driver/MOM_surface_forcing.F90 @@ -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 "//& @@ -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 "//& diff --git a/config_src/solo_driver/MOM_surface_forcing.F90 b/config_src/solo_driver/MOM_surface_forcing.F90 index 425c99c403..6b8b0f9497 100644 --- a/config_src/solo_driver/MOM_surface_forcing.F90 +++ b/config_src/solo_driver/MOM_surface_forcing.F90 @@ -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 "//& @@ -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 "//&