From 8b3d4a328170adea2d7f67310e0779aeac802a68 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Wed, 8 Apr 2026 13:41:01 -0600 Subject: [PATCH 1/4] fix get_param STOKES_MOST and WAVE_ENHANCED_USTAR in MOM.F90 by opening/closing appropriate parameter blocks --- src/core/MOM.F90 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index 5657bdbaf1..c7de18f686 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -34,6 +34,7 @@ module MOM use MOM_error_handler, only : MOM_set_verbosity, callTree_showQuery use MOM_error_handler, only : callTree_enter, callTree_leave, callTree_waypoint use MOM_file_parser, only : read_param, get_param, log_version, param_file_type +use MOM_file_parser, only : openParameterBlock, closeParameterBlock use MOM_forcing_type, only : forcing, mech_forcing, find_ustar use MOM_forcing_type, only : MOM_forcing_chksum, MOM_mech_forcing_chksum use MOM_get_input, only : Get_MOM_Input, directories @@ -2469,12 +2470,16 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & call MOM_error(FATAL, "initialize_MOM: "//& "FPMIX=True only works when SPLIT=True.") endif - ! STOKES_MOST and needed to + ! STOKES_MOST + call openParameterBlock(param_file, 'KPP', do_not_log=.true.) call get_param(param_file, '', 'STOKES_MOST', CS%StokesMOST, & 'If True, use Stokes Similarity package.', & default=.False., do_not_log=.true.) + call closeParameterBlock(param_file) + call openParameterBlock(param_file,'MLE') ! Prepend MLE% to all parameters call get_param(param_file, '', "WAVE_ENHANCED_USTAR", CS%wave_enhanced_ustar, & "If true, enhance ustar in Bodner23.", default=.false., do_not_log=.true.) + call closeParameterBlock(param_file) call get_param(param_file, "MOM", "BOUSSINESQ", Boussinesq, & "If true, make the Boussinesq approximation.", default=.true., do_not_log=.true.) call get_param(param_file, "MOM", "SEMI_BOUSSINESQ", semi_Boussinesq, & From ed96f681fef597b21ee396901db18ff9fa1b330a Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Wed, 8 Apr 2026 14:46:57 -0600 Subject: [PATCH 2/4] remove unnecessary comment --- src/core/MOM.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index c7de18f686..00e7c52373 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2476,7 +2476,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & 'If True, use Stokes Similarity package.', & default=.False., do_not_log=.true.) call closeParameterBlock(param_file) - call openParameterBlock(param_file,'MLE') ! Prepend MLE% to all parameters + call openParameterBlock(param_file,'MLE') call get_param(param_file, '', "WAVE_ENHANCED_USTAR", CS%wave_enhanced_ustar, & "If true, enhance ustar in Bodner23.", default=.false., do_not_log=.true.) call closeParameterBlock(param_file) From 810ed7b9f5b4fd5d1348ee92e6e6cd4bb2294f5d Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Wed, 8 Apr 2026 14:50:13 -0600 Subject: [PATCH 3/4] remove more unnecessary comment --- src/core/MOM.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index 00e7c52373..debf37ef41 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2470,7 +2470,6 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & call MOM_error(FATAL, "initialize_MOM: "//& "FPMIX=True only works when SPLIT=True.") endif - ! STOKES_MOST call openParameterBlock(param_file, 'KPP', do_not_log=.true.) call get_param(param_file, '', 'STOKES_MOST', CS%StokesMOST, & 'If True, use Stokes Similarity package.', & From 19d35b9f8bda5cd8f2f88b491bca27884c355d51 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Wed, 8 Apr 2026 15:01:27 -0600 Subject: [PATCH 4/4] do not log MLE block from MOM.F90 --- src/core/MOM.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index debf37ef41..adbf7fe36c 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2475,7 +2475,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & 'If True, use Stokes Similarity package.', & default=.False., do_not_log=.true.) call closeParameterBlock(param_file) - call openParameterBlock(param_file,'MLE') + call openParameterBlock(param_file,'MLE', do_not_log=.true.) call get_param(param_file, '', "WAVE_ENHANCED_USTAR", CS%wave_enhanced_ustar, & "If true, enhance ustar in Bodner23.", default=.false., do_not_log=.true.) call closeParameterBlock(param_file)