--- MITgcm/pkg/seaice/seaice_calc_strainrates.F 2012/03/06 16:45:20 1.19 +++ MITgcm/pkg/seaice/seaice_calc_strainrates.F 2017/05/26 09:08:32 1.22 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_calc_strainrates.F,v 1.19 2012/03/06 16:45:20 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_calc_strainrates.F,v 1.22 2017/05/26 09:08:32 mlosch Exp $ C $Name: $ #include "SEAICE_OPTIONS.h" @@ -7,6 +7,9 @@ #else # define OBCS_UVICE_OLD #endif +#ifdef ALLOW_AUTODIFF +# include "AUTODIFF_OPTIONS.h" +#endif CBOP C !ROUTINE: SEAICE_CALC_STRAINRATES @@ -84,6 +87,9 @@ k = 1 noSlipFac = 0. _d 0 IF ( SEAICE_no_slip ) noSlipFac = 1. _d 0 +C in order repoduce results before fixing a bug in r1.20 comment out +C the following line +CML IF ( SEAICE_no_slip ) noSlipFac = 2. _d 0 C DO bj=myByLo(myThid),myByHi(myThid) DO bi=myBxLo(myThid),myBxHi(myThid) @@ -148,7 +154,7 @@ & ) & *maskC(i ,j ,k,bi,bj)*maskC(i-1,j ,k,bi,bj) & *maskC(i ,j-1,k,bi,bj)*maskC(i-1,j-1,k,bi,bj) - & + 2.0 _d 0 * noSlipFac * ( + & + noSlipFac * ( & 2.0 _d 0 * uave(i,j) * _recip_dyU(i,j,bi,bj) * hFacU & + 2.0 _d 0 * vave(i,j) * _recip_dxV(i,j,bi,bj) * hFacV & ) @@ -159,7 +165,6 @@ c$$$ & - hFacU * k2AtZ(i,j,bi,bj) * uave(i,j) ENDDO ENDDO - ENDDO ENDDO