Fix output from remapping conservation check. #62

NOAA-GFDL · Jun 4, 2015 · 6911097 · 6911097
1 parent 0dda96c
commit 6911097
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ALE/MOM_remapping.F90 b/src/ALE/MOM_remapping.F90
@@ -400,7 +400,7 @@ subroutine remapping_core( CS, n0, h0, u0, n1, dx, u1 )
     if (k <= n0) then
       hTmp = h0(k) + ( dx(k+1) - dx(k) )
       if (hTmp < 0.) then
-        write(0,*) 'k,h0(k),hNew,dx(+1),dx(0)=',k,h0(k),dx(k+1),dx(k)
+        write(0,*) 'k,h0(k),hTmp,dx(k+1),dx(k)=',k,h0(k),hTmp,dx(k+1),dx(k)
         call MOM_error( FATAL, 'MOM_remapping, remapping_core: '//&
              'negative h implied by fluxes' )
       endif
@@ -534,9 +534,9 @@ subroutine remapping_core( CS, n0, h0, u0, n1, dx, u1 )
     if (k<=n0) then; hTmp = h0(k); else; hTmp = 0.; endif
     z0 = z0 + hTmp ; z1 = z1 + ( hTmp + ( dx(k+1) - dx(k) ) )
   enddo
-  if (abs(totalHU2-totalHU0) > (err0+err2)*real(n1) .and. (err0+err2)/=0.) then
+  if (abs(totalHU2-totalHU0) > (err0+err2)*max(real(n0), real(n1)) .and. (err0+err2)/=0.) then
     write(0,*) 'h0=',h0
-    write(0,*) 'hf=',h0+dx(2:n1+1)-dx(1:n1)
+    write(0,*) 'hf=',h0(1:n1)+dx(2:n1+1)-dx(1:n1)
     write(0,*) 'u0=',u0
     write(0,*) 'u1=',u1
     write(0,*) 'total HU0,HUf,f-0=',totalHU0,totalHU2,totalHU2-totalHU0