--- MITgcm/pkg/seaice/seaice_tracer_phys.F 2012/12/27 23:05:47 1.9 +++ MITgcm/pkg/seaice/seaice_tracer_phys.F 2014/08/23 20:22:16 1.11 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_tracer_phys.F,v 1.9 2012/12/27 23:05:47 gforget Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_tracer_phys.F,v 1.11 2014/08/23 20:22:16 torge Exp $ C $Name: $ #include "SEAICE_OPTIONS.h" @@ -15,6 +15,7 @@ C === Global variables === #include "SIZE.h" #include "EEPARAMS.h" +#include "PARAMS.h" #include "FFIELDS.h" #include "DYNVARS.h" #include "SEAICE_SIZE.h" @@ -89,7 +90,7 @@ DIAGarray(I,J,5+(iTr-1)*5) = & HEFFprev*SItracer(i,j,bi,bj,iTr) + SItrBucket(i,j,bi,bj,iTr) #endif -c apply the sequence of thermodynamics increments to actual traceur +c apply the sequence of thermodynamics increments to actual tracer c (see seaice_growth.F) c (jTh=1 tendency due to ice-ocean interaction) c (jTh=2 tendency due to the atmosphere, over ice covered part) @@ -190,12 +191,12 @@ c 3) ice-ocean tracer exchange/mapping to external variables c ========================================================== #ifdef ALLOW_DIAGNOSTICS - if (SItrMate(iTr).EQ.'HEFF') then + IF ( useDiagnostics .AND. SItrMate(iTr).EQ.'HEFF') THEN WRITE(diagName,'(A4,I2.2,A2)') 'SItr',iTr,'Fx' tmpscal1=-ONE/SEAICE_deltaTtherm*SEAICE_rhoIce CALL DIAGNOSTICS_SCALE_FILL(SItrBucket(1-OLx,1-OLy,bi,bj,iTr), & tmpscal1, 1, diagName,0,1,2,bi,bj,myThid) - endif + ENDIF #endif if ( (SItrName(iTr).EQ.'salinity').AND. @@ -222,7 +223,9 @@ & *HEFFM(I,J,bi,bj)/SEAICE_deltaTtherm*SEAICE_rhoIce #endif c empty bucket - SItrBucket(i,j,bi,bj,iTr)=0. _d 0 +c but not for 'grease' (see seaice_growth.F) + if (SItrName(iTr).NE.'grease') + & SItrBucket(i,j,bi,bj,iTr)=0. _d 0 ENDDO ENDDO