From 7cbc198cda6d7d187269c12d8e097cb92e9168cf Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Mon, 24 Mar 2014 14:04:13 +1100 Subject: [PATCH 1/3] mom-87: don't reference uninitialised k. --- src/mom5/ocean_core/ocean_thickness.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mom5/ocean_core/ocean_thickness.F90 b/src/mom5/ocean_core/ocean_thickness.F90 index 39f36faee3..c28bdb53f2 100644 --- a/src/mom5/ocean_core/ocean_thickness.F90 +++ b/src/mom5/ocean_core/ocean_thickness.F90 @@ -4541,7 +4541,7 @@ subroutine update_tcell_thick_blob(Time, Grid, Ext_mode, Dens, Thickness) Thickness%dztloT(i,j,1) = Thickness%dstlo(i,j,1)*Thickness%dzt_dst(i,j,1) Thickness%dztupT(i,j,1) = Thickness%dstup(i,j,1)*Thickness%dzt_dst(i,j,1) Thickness%dztT(i,j,1,taup1) = Thickness%dztloT(i,j,1) + Thickness%dztupT(i,j,1) - Thickness%rho_dztT(i,j,k,taup1) = Thickness%rho_dztT(i,j,k,tau) + dtime*Thickness%rho_dzt_tendency(i,j,k) + Thickness%rho_dztT(i,j,1,taup1) = Thickness%rho_dztT(i,j,1,tau) + dtime*Thickness%rho_dzt_tendency(i,j,1) wrk1(i,j,:) = 1.0 enddo enddo From 0bfa9b674c2e298d08090c1eaee5727633817abc Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Mon, 24 Mar 2014 14:08:19 +1100 Subject: [PATCH 2/3] mom-87: syntax error, remove double +. --- src/ocean_shared/generic_tracers/generic_COBALT.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ocean_shared/generic_tracers/generic_COBALT.F90 b/src/ocean_shared/generic_tracers/generic_COBALT.F90 index a7e0daeddb..612eef30d7 100644 --- a/src/ocean_shared/generic_tracers/generic_COBALT.F90 +++ b/src/ocean_shared/generic_tracers/generic_COBALT.F90 @@ -5549,7 +5549,7 @@ subroutine generic_COBALT_update_from_source(tracer_list,Temp,Salt,rho_dzt,dzt,h do k = 1, nk ; do j =jsc, jec ; do i = isc, iec !{ cobalt%jo2(i,j,k) = (cobalt%o2_2_no3 * (phyto(DIAZO)%juptake_no3(i,j,k) + & phyto(LARGE)%juptake_no3(i,j,k) + phyto(SMALL)%juptake_no3(i,j,k)) + & - + cobalt%o2_2_nh4 * & + cobalt%o2_2_nh4 * & (phyto(DIAZO)%juptake_nh4(i,j,k) + phyto(LARGE)%juptake_nh4(i,j,k) + & phyto(SMALL)%juptake_nh4(i,j,k) + & phyto(DIAZO)%juptake_n2(i,j,k))) * grid_tmask(i,j,k) From b8aa5eb6b2e8db4a8cf89028fe549b488d539eec Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Mon, 24 Mar 2014 14:11:41 +1100 Subject: [PATCH 3/3] mom-87: fix topog_step indexing. --- src/mom5/ocean_param/lateral/ocean_mixdownslope.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mom5/ocean_param/lateral/ocean_mixdownslope.F90 b/src/mom5/ocean_param/lateral/ocean_mixdownslope.F90 index d0241a18ac..8a53458175 100644 --- a/src/mom5/ocean_param/lateral/ocean_mixdownslope.F90 +++ b/src/mom5/ocean_param/lateral/ocean_mixdownslope.F90 @@ -518,19 +518,19 @@ subroutine ocean_mixdownslope_init(Grid, Domain, Time, Dens, T_prog, Ocean_optio id_topog_step_1 = register_static_field ('ocean_model', 'topog_step_1', Grd%tracer_axes(1:2), & 'topog_step_1', 'dimensionless', missing_value=missing_value, range=(/-1.0,1.0/)) - call diagnose_2d(Time, Grd, id_topog_step_1, topog_step(1,:,:)) + call diagnose_2d(Time, Grd, id_topog_step_1, topog_step(:,:,1)) id_topog_step_2 = register_static_field ('ocean_model', 'topog_step_2', Grd%tracer_axes(1:2), & 'topog_step_2', 'dimensionless', missing_value=missing_value, range=(/-1.0,1.0/)) - call diagnose_2d(Time, Grd, id_topog_step_2, topog_step(2,:,:)) + call diagnose_2d(Time, Grd, id_topog_step_2, topog_step(:,:,2)) id_topog_step_3 = register_static_field ('ocean_model', 'topog_step_3', Grd%tracer_axes(1:2), & 'topog_step_3', 'dimensionless', missing_value=missing_value, range=(/-1.0,1.0/)) - call diagnose_2d(Time, Grd, id_topog_step_3, topog_step(3,:,:)) + call diagnose_2d(Time, Grd, id_topog_step_3, topog_step(:,:,3)) id_topog_step_4 = register_static_field ('ocean_model', 'topog_step_4', Grd%tracer_axes(1:2), & 'topog_step_4', 'dimensionless', missing_value=missing_value, range=(/-1.0,1.0/)) - call diagnose_2d(Time, Grd, id_topog_step_4, topog_step(4,:,:)) + call diagnose_2d(Time, Grd, id_topog_step_4, topog_step(:,:,4)) allocate (id_mixdownslope(num_prog_tracers))