From 30fb3a6d8809b8c26269cdd58d1a853935ec7ed9 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Thu, 19 Dec 2024 12:03:28 -0600 Subject: [PATCH] Move manufactured soln parameter setting to init routine --- .../mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F b/components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F index c114fbf921ea..6dd1e1d6e317 100644 --- a/components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F +++ b/components/mpas-ocean/src/shared/mpas_ocn_manufactured_solution.F @@ -204,12 +204,10 @@ subroutine ocn_manufactured_solution_tend_vel(forcingPool, tend, err)!{{{ if (.not. config_disable_vel_hmix) then if (config_use_mom_del2) then - viscDel2 = config_mom_del2 u = u + viscDel2 * eta0 * (kx**2 + ky**2) * cos(phase) v = v + viscDel2 * eta0 * (kx**2 + ky**2) * cos(phase) endif if (config_use_mom_del4) then - viscDel4 = config_mom_del4 u = u - viscDel4 * eta0 * ((kx**4 + ky**4 + kx**2 * ky**2) * cos(phase)) v = v - viscDel4 * eta0 * ((kx**4 + ky**4 + kx**2 * ky**2) * cos(phase)) endif @@ -249,6 +247,9 @@ subroutine ocn_manufactured_solution_init(domain, err)!{{{ if (.not. config_use_manufactured_solution) return + viscDel2 = config_mom_del2 + viscDel4 = config_mom_del4 + kx = 2.0_RKIND*pi / config_manufactured_solution_wavelength_x ky = 2.0_RKIND*pi / config_manufactured_solution_wavelength_y