From dade9d5abb511807b07c5d7eadc88c35abfc0d3a Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Thu, 31 Oct 2024 17:47:39 -0600 Subject: [PATCH] move get_param("KPP_CVt2") out of if block Make sure that KPP_CVt2 is read whenever KPP is enabled (may eventually want to only provide it if using Stokes MOST?) --- src/parameterizations/vertical/MOM_CVMix_KPP.F90 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 index b0c9d815f4..b07e3261af 100644 --- a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 +++ b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 @@ -437,9 +437,6 @@ logical function KPP_init(paramFile, G, GV, US, diag, Time, CS, passive) case default ; call MOM_error(FATAL,"KPP_init: "//& "Unrecognized KPP_LT_K_SHAPE option: "//trim(string)) end select - call get_param(paramFile, mdl, "KPP_CVt2", CS%KPP_CVt2, & - 'Parameter for Stokes MOST convection entrainment', & - units="nondim", default=1.6) call get_param(paramFile, mdl, "KPP_LT_K_METHOD", string , & 'Method to enhance mixing coefficient in KPP. '// & 'Valid options are: \n'// & @@ -518,6 +515,10 @@ logical function KPP_init(paramFile, G, GV, US, diag, Time, CS, passive) units="m", default=1.0, scale=US%m_to_Z) endif + call get_param(paramFile, mdl, "KPP_CVt2", CS%KPP_CVt2, & + 'Parameter for Stokes MOST convection entrainment', & + units="nondim", default=1.6) + call get_param(paramFile, mdl, "ANSWER_DATE", CS%answer_date, & "The vintage of the order of arithmetic in the CVMix KPP calculations. Values "//& "below 20240501 recover the answers from early in 2024, while higher values "//&