From 2c6bdf9256e1324b5c4c5eafcb94676e283e06c8 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 20 Nov 2019 13:45:29 -0700 Subject: [PATCH 1/3] Create a separate param for MEKE bottom drag (CDRAG_MEKE) --- src/parameterizations/lateral/MOM_MEKE.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90 index a009aea1f6..c03764395a 100644 --- a/src/parameterizations/lateral/MOM_MEKE.F90 +++ b/src/parameterizations/lateral/MOM_MEKE.F90 @@ -1197,10 +1197,10 @@ logical function MEKE_init(Time, G, US, param_file, diag, CS, MEKE, restart_CS) units="nondim", default=0.0) ! Nonlocal module parameters - call get_param(param_file, mdl, "CDRAG", CS%cdrag, & + call get_param(param_file, mdl, "CDRAG_MEKE", CS%cdrag, & "CDRAG is the drag coefficient relating the magnitude of "//& "the velocity field to the bottom stress.", units="nondim", & - default=0.003) + default=0.001) call get_param(param_file, mdl, "LAPLACIAN", laplacian, default=.false., do_not_log=.true.) call get_param(param_file, mdl, "BIHARMONIC", biharmonic, default=.false., do_not_log=.true.) From 02c986a7727df3599f863cccf5ce708462abcfe9 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 4 Dec 2019 15:33:42 -0700 Subject: [PATCH 2/3] Set default value to 0.003 --- src/parameterizations/lateral/MOM_MEKE.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90 index c03764395a..c1ef01fe47 100644 --- a/src/parameterizations/lateral/MOM_MEKE.F90 +++ b/src/parameterizations/lateral/MOM_MEKE.F90 @@ -1200,7 +1200,7 @@ logical function MEKE_init(Time, G, US, param_file, diag, CS, MEKE, restart_CS) call get_param(param_file, mdl, "CDRAG_MEKE", CS%cdrag, & "CDRAG is the drag coefficient relating the magnitude of "//& "the velocity field to the bottom stress.", units="nondim", & - default=0.001) + default=0.003) call get_param(param_file, mdl, "LAPLACIAN", laplacian, default=.false., do_not_log=.true.) call get_param(param_file, mdl, "BIHARMONIC", biharmonic, default=.false., do_not_log=.true.) From 97d07bcb4c51f72a2142ecc360b743ab0d11ceec Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 4 Dec 2019 17:25:54 -0700 Subject: [PATCH 3/3] Set the default for CDRAG_MEKE to CDRAG --- src/parameterizations/lateral/MOM_MEKE.F90 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90 index c1ef01fe47..877502929a 100644 --- a/src/parameterizations/lateral/MOM_MEKE.F90 +++ b/src/parameterizations/lateral/MOM_MEKE.F90 @@ -1003,6 +1003,7 @@ logical function MEKE_init(Time, G, US, param_file, diag, CS, MEKE, restart_CS) real :: L_rescale ! A rescaling factor for length from the internal representation in this ! run to the representation in a restart file. real :: MEKE_restoring_timescale ! The timescale used to nudge MEKE toward its equilibrium value. + real :: cdrag ! The default bottom drag coefficient [nondim]. integer :: i, j, is, ie, js, je, isd, ied, jsd, jed logical :: laplacian, biharmonic, useVarMix, coldStart ! This include declares and sets the variable "version". @@ -1197,10 +1198,14 @@ logical function MEKE_init(Time, G, US, param_file, diag, CS, MEKE, restart_CS) units="nondim", default=0.0) ! Nonlocal module parameters - call get_param(param_file, mdl, "CDRAG_MEKE", CS%cdrag, & + call get_param(param_file, mdl, "CDRAG", cdrag, & "CDRAG is the drag coefficient relating the magnitude of "//& "the velocity field to the bottom stress.", units="nondim", & default=0.003) + call get_param(param_file, mdl, "CDRAG_MEKE", CS%cdrag, & + "CDRAG is the drag coefficient relating the magnitude of "//& + "the velocity field to the bottom stress.", units="nondim", & + default=cdrag) call get_param(param_file, mdl, "LAPLACIAN", laplacian, default=.false., do_not_log=.true.) call get_param(param_file, mdl, "BIHARMONIC", biharmonic, default=.false., do_not_log=.true.)