--- MITgcm/pkg/seaice/seaice_tracer_phys.F	2012/03/05 14:52:16	1.8
+++ MITgcm/pkg/seaice/seaice_tracer_phys.F	2013/08/11 02:31:12	1.10
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_tracer_phys.F,v 1.8 2012/03/05 14:52:16 gforget Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_tracer_phys.F,v 1.10 2013/08/11 02:31:12 jmc 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"
@@ -173,7 +174,6 @@
 c "ice concentration" tracer: no specific process
       elseif (SItrName(iTr).EQ.'ridge') then
 c simple, made up, ice surface roughness index prototype
-#ifndef SEAICE_GROWTH_LEGACY
        DO J=1,sNy
         DO I=1,sNx
 c ridging increases roughness
@@ -187,17 +187,16 @@
           SItracer(i,j,bi,bj,iTr)=SItracer(i,j,bi,bj,iTr)*tmpscal1
         ENDDO
        ENDDO
-#endif
       endif
 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.