--- MITgcm/pkg/seaice/groatb.F 2003/05/23 17:51:22 1.1.2.8 +++ MITgcm/pkg/seaice/groatb.F 2003/04/30 08:23:08 1.4.4.6 @@ -39,16 +39,10 @@ INTEGER i, j, bi, bj INTEGER KOPEN _RL U1, V1, SPEED_SQ + _RL HICE (1-OLx:sNx+OLx, 1-OLy:sNy+OLy) _RL UG (1-OLx:sNx+OLx, 1-OLy:sNy+OLy) -#ifdef SEAICE_MULTILEVEL - INTEGER it - _RL RK - _RL HICEP(1-OLx:sNx+OLx, 1-OLy:sNy+OLy) - _RL FICEP(1-OLx:sNx+OLx, 1-OLy:sNy+OLy) -#endif - C if this is not done before then do it here _EXCH_XY_R8(UWIND, myThid) _EXCH_XY_R8(VWIND, myThid) @@ -63,9 +57,6 @@ DO I=1,sNx AREA(I,J,2,bi,bj)=MAX(A22,AREA(I,J,2,bi,bj)) FHEFF(I,J,bi,bj)=0.0 _d 0 -#ifdef SEAICE_MULTILEVEL - FICEP(I,J)=0.0 _d 0 -#endif HICE(I,J)=HEFF(I,J,2,bi,bj)/AREA(I,J,2,bi,bj) ENDDO ENDDO @@ -87,7 +78,7 @@ V1=0.25 _d 0*(VWIND(I+1,J+1,bi,bj)+VWIND(I+1,J,bi,bj) 1 +VWIND(I,J+1,bi,bj)+VWIND(I,J,bi,bj)) SPEED_SQ = U1**2 + V1**2 - IF ( SPEED_SQ .LE. SEAICE_EPS_SQ ) THEN + IF ( SPEED_SQ .LT. SEAICE_EPS_SQ ) THEN UG(I,J)=SEAICE_EPS ELSE UG(I,J)=SQRT(SPEED_SQ) @@ -101,31 +92,7 @@ CALL BUDGET(UG, TMIX, HICE, FO, KOPEN, bi, bj) C NOW DO ICE KOPEN=1 -#ifdef SEAICE_MULTILEVEL - DO IT=1,7 - DO J=1,sNy - DO I=1,sNx - RK=IT*1.0 - HICEP(I,J)=(HICE(I,J)/7.0 _d 0)*((2.0 _d 0*RK)-1.0 _d 0) - TICE(I,J,bi,bj)=TICES(I,J,IT,bi,bj) - ENDDO - ENDDO - CALL BUDGET(UG, TICE, HICEP, FICE, KOPEN, bi, bj) - DO J=1,sNy - DO I=1,sNx - FICEP(I,J)=(FICE(I,J,bi,bj)/7.0 _d 0)+FICEP(I,J) - TICES(I,J,IT,bi,bj)=TICE(I,J,bi,bj) - ENDDO - ENDDO - ENDDO - DO J=1,sNy - DO I=1,sNx - FICE(I,J,bi,bj)=FICEP(I,J) - ENDDO - ENDDO -#else /* SEAICE_MULTILEVEL */ CALL BUDGET(UG, TICE, HICE, FICE, KOPEN, bi, bj) -#endif /* SEAICE_MULTILEVEL */ ENDDO ENDDO