--- MITgcm/pkg/ctrl/ctrl_getobcsw.F 2003/06/19 15:18:48 1.1.2.3 +++ MITgcm/pkg/ctrl/ctrl_getobcsw.F 2003/10/26 00:58:03 1.5 @@ -120,7 +120,7 @@ do iobcs = 1,nobcs if ( obcswfirst ) then - call active_read_yz( fnameobcsw, tmpfldyz, + call active_read_yz_loc( fnameobcsw, tmpfldyz, & (obcswcount0-1)*nobcs+iobcs, & doglobalread, ladinit, optimcycle, & mythid, xx_obcsw_dummy ) @@ -148,7 +148,7 @@ cgg exactly balance the volume flux, since we are dealing with cgg the baroclinic velocity structure.. utop = tmpfldyz(j,k,bi,bj)* - & maskW(i+ip1,j,k,bi,bj) * delZ(k) + utop + & maskW(i+ip1,j,k,bi,bj) * delR(k) + utop cgg Add the barotropic velocity component. if (maskW(i+ip1,j,k,bi,bj) .ne. 0.) then tmpfldyz(j,k,bi,bj) = tmpfldyz(j,k,bi,bj)+ ubaro @@ -156,7 +156,7 @@ enddo cgg Compute the baroclinic velocity at level 1. Should balance flux. tmpfldyz(j,1,bi,bj) = tmpfldyz(j,1,bi,bj) - & - utop / delZ(1) + & - utop / delR(1) enddo enddo enddo @@ -183,7 +183,7 @@ cgg exactly balance the volume flux, since we are dealing with cgg the baroclinic velocity structure.. utop = tmpfldyz(j,k,bi,bj)* - & maskS(i,j,k,bi,bj) * delZ(k) + utop + & maskS(i,j,k,bi,bj) * delR(k) + utop cgg Add the barotropic velocity component. if (maskS(i,j,k,bi,bj) .ne. 0.) then tmpfldyz(j,k,bi,bj) = tmpfldyz(j,k,bi,bj)+ ubaro @@ -191,7 +191,7 @@ enddo cgg Compute the baroclinic velocity at level 1. Should balance flux. tmpfldyz(j,1,bi,bj) = tmpfldyz(j,1,bi,bj) - & - utop / delZ(1) + & - utop / delR(1) enddo enddo enddo @@ -212,7 +212,7 @@ if ( (obcswfirst) .or. (obcswchanged)) then -cgg( This is a terribly long way to do it. However, the dimensions don't exactly +cgg( This is a terribly long way to do it. However, the dimensions do not exactly cgg match up. I will blame Fortran for the ugliness. do bj = jtlo,jthi @@ -237,7 +237,7 @@ enddo enddo - call active_read_yz( fnameobcsw, tmpfldyz, + call active_read_yz_loc( fnameobcsw, tmpfldyz, & (obcswcount1-1)*nobcs+iobcs, & doglobalread, ladinit, optimcycle, & mythid, xx_obcsw_dummy ) @@ -265,7 +265,7 @@ cgg exactly balance the volume flux, since we are dealing with cgg the baroclinic velocity structure.. utop = tmpfldyz(j,k,bi,bj)* - & maskW(i+ip1,j,k,bi,bj) * delZ(k) + utop + & maskW(i+ip1,j,k,bi,bj) * delR(k) + utop cgg Add the barotropic velocity component. if (maskW(i+ip1,j,k,bi,bj) .ne. 0.) then tmpfldyz(j,k,bi,bj) = tmpfldyz(j,k,bi,bj)+ ubaro @@ -273,7 +273,7 @@ enddo cgg Compute the baroclinic velocity at level 1. Should balance flux. tmpfldyz(j,1,bi,bj) = tmpfldyz(j,1,bi,bj) - & - utop / delZ(1) + & - utop / delR(1) enddo enddo enddo @@ -300,7 +300,7 @@ cgg exactly balance the volume flux, since we are dealing with cgg the baroclinic velocity structure.. utop = tmpfldyz(j,k,bi,bj)* - & maskS(i,j,k,bi,bj) * delZ(k) + utop + & maskS(i,j,k,bi,bj) * delR(k) + utop cgg Add the barotropic velocity component. if (maskS(i,j,k,bi,bj) .ne. 0.) then tmpfldyz(j,k,bi,bj) = tmpfldyz(j,k,bi,bj)+ ubaro @@ -308,7 +308,7 @@ enddo cgg Compute the baroclinic velocity at level 1. Should balance flux. tmpfldyz(j,1,bi,bj) = tmpfldyz(j,1,bi,bj) - & - utop / delZ(1) + & - utop / delR(1) enddo enddo enddo