Merge pull request #33 from nicholash/mom-87-various-bugs

Mom 87 various bugs
mom-ocean · Mar 24, 2014 · f406b4c · f406b4c
2 parents 0c5fc44 + b8aa5eb
commit f406b4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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

diff --git 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))

diff --git 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)