--- MITgcm/pkg/seaice/SEAICE_TRACER.h	2011/03/05 18:06:49	1.1
+++ MITgcm/pkg/seaice/SEAICE_TRACER.h	2012/02/16 01:22:02	1.7
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/SEAICE_TRACER.h,v 1.1 2011/03/05 18:06:49 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/SEAICE_TRACER.h,v 1.7 2012/02/16 01:22:02 gforget Exp $
 C $Name:  $
 
 CBOP
@@ -10,27 +10,50 @@
 C     | o Begin header for sea ice tracers                       |
 C     \==========================================================/
 C
-C     IceAgeTr(1) - effective sea ice age
-C             at center of grid, i.e., tracer point
-C             ==> for non-zero AREA, units of ICEAGEAREA are seconds
-C                 and actual ice age is ICEAGEAREA / AREA seconds
-C     IceAgeTr(2) - effective sea ice age
-C             at center of grid, i.e., tracer point
-C             ==> for non-zero HEFF,
-C                 units of ICEAGEVOL are seconds * meters
-C                 and actual ice age is ICEAGEVOL / HEFF seconds
-C     IceAgeTr(3), IceAgeTr(4) - effective sea ice age
-C             t.b.d. (poor-man's multi-category)
 C \ev
 CEOP
 
-#ifdef SEAICE_AGE
-      COMMON/SEAICE_AGE_R/IceAgeTr
-      _RL IceAgeTr   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,SEAICE_num)
-C--
-C     IceAgeTrFile    - File containing initial sea ice age
-      CHARACTER*(MAX_LEN_FNAM) IceAgeTrFile(SEAICE_num)
-      COMMON /SEAICE_AGE_C/ IceAgeTrFile
+#ifdef ALLOW_SITRACER
+
+C     SItrNumInUse - Number of tracers that are in use (must be less that SItrMaxNum)
+      INTEGER SItrNumInUse
+      COMMON /SEAICE_TRACER_I/ SItrNumInUse
+
+C     SItracer   - generic ice tracer array
+C     SItrBucket - collected SItracer to be later passed to the ocean
+C     SItrHEFF   - history of HEFF evolution during seaice_growth
+C     SItrAREA   - history of AREA evolution during seaice_growth
+      _RL SItracer (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,SItrMaxNum)
+      _RL SItrBucket (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,SItrMaxNum)
+      _RL SItrHEFF (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,5)
+      _RL SItrAREA (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,3)
+      COMMON /SEAICE_TRACER_R/
+     &        SItracer, SItrBucket, SItrHEFF, SItrAREA
+
+C     SItrFromOcean0    - for new ice from ocean freeze - constant tracer value
+C     SItrFromOceanFrac - for new ice from ocean freeze - fraction of ocean tracer 
+C     SItrFromFlood0    - for new ice from snow flood   - constant tracer value
+C     SItrFromFloodFrac - for new ice from snow flood   - fraction of ocean tracer
+C     SItrExpand0       - for ice cover thermo. exans.  - constant tracer value
+      _RL SItrFromOcean0(SItrMaxNum), SItrFromOceanFrac(SItrMaxNum),
+     &    SItrFromFlood0(SItrMaxNum), SItrFromFloodFrac(SItrMaxNum),
+     &    SItrExpand0(SItrMaxNum)
+      COMMON /SEAICE_TRACER_CONST_R/
+     &    SItrFromOcean0, SItrFromOceanFrac, SItrFromFlood0, 
+     &    SItrFromFloodFrac, SItrExpand0
+
+C     SItrFile        - File containing initial sea ice tracer
+C     SItrName        - tracer name ('salinity', 'age', 'one', etc.)
+C     SItrNameLong    - tracer long name
+C     SItrUnit        - tracer unit ('psu','s','kg/kg', etc.)
+C     SItrMate        - variable to which the tracer is associated ('HEFF','AREA',etc.)
+      CHARACTER*(MAX_LEN_FNAM) SItrFile(SItrMaxNum)
+      CHARACTER*(MAX_LEN_FNAM) SItrName(SItrMaxNum)
+      CHARACTER*(MAX_LEN_FNAM) SItrNameLong(SItrMaxNum)
+      CHARACTER*(MAX_LEN_FNAM) SItrUnit(SItrMaxNum)
+      CHARACTER*(4) SItrMate(SItrMaxNum)
+      COMMON /SEAICE_SITR_C/ SItrFile, SItrName, SItrMate,
+     &  SItrNameLong, SItrUnit
 #endif
 
 CEH3 ;;; Local Variables: ***