--- MITgcm/verification/hs94.128x64x5/code/external_forcing.F 2001/06/04 20:30:49 1.5 +++ MITgcm/verification/hs94.128x64x5/code/external_forcing.F 2001/06/06 16:59:07 1.6 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.128x64x5/code/external_forcing.F,v 1.5 2001/06/04 20:30:49 adcroft Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/hs94.128x64x5/code/external_forcing.F,v 1.6 2001/06/06 16:59:07 adcroft Exp $ C $Name: $ #include "CPP_OPTIONS.h" @@ -55,7 +55,7 @@ IF ( HFacW(i,j,kLev,bi,bj) .GT. 0. ) THEN C termP=0.5*( rF(kLev) + min( rF(kLev+1) , C & min(H(I,J,bi,bj),H(I,J-1,bi,bj)) ) ) - termP=0.5*( rF(kLev) + rF(kLev+1) ) + termP=0.5 _d 0*( rF(kLev) + rF(kLev+1) ) kV=kF*MAX(0. _d 0, & (termP*recip_Rcol(I,J,bi,bj)-0.7 _d 0)/(1. _d 0-0.7 _d 0) ) gU(i,j,kLev,bi,bj)=gU(i,j,kLev,bi,bj) @@ -118,7 +118,7 @@ IF ( HFacS(i,j,kLev,bi,bj) .GT. 0. ) THEN C termP=0.5*( rF(kLev) + min( rF(kLev+1) , C & min(H(I,J,bi,bj),H(I,J-1,bi,bj)) ) ) - termP=0.5*( rF(kLev) + rF(kLev+1) ) + termP=0.5 _d 0*( rF(kLev) + rF(kLev+1) ) kV=kF*MAX(0. _d 0, & (termP*recip_Rcol(I,J,bi,bj)-0.7 _d 0)/(1. _d 0-0.7 _d 0) ) gV(i,j,kLev,bi,bj)=gV(i,j,kLev,bi,bj) @@ -173,15 +173,15 @@ DO J=jMin,jMax term1=60. _d 0*(sin(yC(1,J,bi,bj)*deg2rad)**2) C termP=0.5*( rF(kLev) + min( rF(kLev+1) , H(I,J,bi,bj) ) ) - termP=0.5*( rF(kLev) + rF(kLev+1) ) + termP=0.5 _d 0*( rF(kLev) + rF(kLev+1) ) term2=10. _d 0*log(termP/rSurf) & *(cos(yC(1,J,bi,bj)*deg2rad)**2) thetaLim = 200. _d 0/((termP/rSurf)**(2. _d 0/7. _d 0)) - thetaEq=315.-term1-term2 + thetaEq=315. _d 0-term1-term2 thetaEq=MAX(thetaLim,thetaEq) DO I=iMin,iMax kT=ka+(ks-ka) - & *MAX(0., + & *MAX(0. _d 0, & (termP*recip_Rcol(I,J,bi,bj)-0.7 _d 0)/(1. _d 0-0.7 _d 0) ) & *COS((yC(1,J,bi,bj)*deg2rad))**4 gT(i,j,kLev,bi,bj)=gT(i,j,kLev,bi,bj)