From 0e9cd30e17dc88d81945cc78891d3a875fe1a52f Mon Sep 17 00:00:00 2001 From: vanroekel Date: Fri, 12 Jul 2024 14:15:38 -0700 Subject: [PATCH] runtime fixes --- components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F | 3 ++- components/mpas-ocean/src/shared/mpas_ocn_vmix_cvmix.F | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F index 74922640630c..26cdab567510 100644 --- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F +++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F @@ -3463,7 +3463,8 @@ subroutine ocn_compute_mixing_input_fields(statePool, forcingPool, & activeTracersSurfaceFlux(indexTempFlux,iCell) & + penetrativeTemperatureFlux(iCell) & - penetrativeTemperatureFluxOBL(iCell) & - - fracAbsorbed*activeTracers(indexTempFlux,kmin,iCell) + - fracAbsorbed*surfaceThicknessFlux(iCell) * & + activeTracers(indexTempFlux,kmin,iCell) nonLocalSurfaceTracerFlux(indexSaltFlux,iCell) = & activeTracersSurfaceFlux(indexSaltFlux,iCell) & diff --git a/components/mpas-ocean/src/shared/mpas_ocn_vmix_cvmix.F b/components/mpas-ocean/src/shared/mpas_ocn_vmix_cvmix.F index 127de4ee87a5..7d1a477b7b9d 100644 --- a/components/mpas-ocean/src/shared/mpas_ocn_vmix_cvmix.F +++ b/components/mpas-ocean/src/shared/mpas_ocn_vmix_cvmix.F @@ -725,9 +725,9 @@ subroutine ocn_vmix_coefs_cvmix_build(meshPool, statePool, forcingPool, err, tim ! intent out of BoundaryLayerDepth is boundary layer depth measured in meters and vertical index indexBoundaryLayerDepth(iCell) = cvmix_variables % kOBL_depth - do k = minLevelCell(iCell), floor(indexBoundaryLayerDepth(iCell)) + 1 - vertViscTopOfCell(k, iCell) = multVal*vertViscTopOfCell(k,iCell) + cvmix_variables % Mdiff_iface(k) - vertDiffTopOfCell(k, iCell) = multVal*vertDiffTopOfCell(k,iCell) + cvmix_variables % Tdiff_iface(k) + do k = minLevelCell(iCell), maxLevelCell(iCell) !floor(indexBoundaryLayerDepth(iCell)) + 1 + vertViscTopOfCell(k, iCell) = cvmix_variables % Mdiff_iface(k) + vertDiffTopOfCell(k, iCell) = cvmix_variables % Tdiff_iface(k) end do ! store non-local flux terms