--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/04/06 17:43:41	1.20
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/06/08 22:15:33	1.22
@@ -90,20 +90,31 @@
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEtopogFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEcostMaskFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICE_ADV_SCHEME
       
 !     THE FOLLOWING FILENAMES ARE FOR SPECIFYING IRREGULAR DOMAIN GEOMETRIES 
 !     (i.e. boundaries that do not conform with rectangular walls)
       CHARACTER*(MAX_LEN_FNAM) STREAMICEhmaskFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEHBCxFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEHBCyFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEuFaceBdryFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile
 
+#ifdef ALLOW_PETSC
 !     CHARACTER PARAMS FOR PETSC
       CHARACTER*(MAX_LEN_FNAM) PETSC_SOLVER_TYPE
       CHARACTER*(MAX_LEN_FNAM) PETSC_PRECOND_TYPE
-      
-      
+#endif
+     
+#ifdef ALLOW_STREAMICE_2DTRACER
+!     CHARACTER PARAMS FOR TRACER
+      CHARACTER*(MAX_LEN_FNAM) STREAMICETrac2DBCxFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICETrac2DBCyFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICETrac2DinitFile
+#endif
+     
       COMMON /STREAMICE_PARM_C/ 
      &     STREAMICEthickInit,
      &     STREAMICEthickFile,
@@ -116,17 +127,29 @@
      &     STREAMICEvelOptimFile,
      &     STREAMICEtopogFile,
      &     STREAMICEhmaskFile,
+     &     STREAMICEHBCxFile,
+     &     STREAMICEHBCyFile,
      &     STREAMICEuFaceBdryFile,
      &     STREAMICEvFaceBdryFile,
      &     STREAMICEuDirichValsFile,
      &     STREAMICEvDirichValsFile,
      &     STREAMICEGlenConstFile,
      &     STREAMICEGlenConstConfig,
-     &     STREAMICEcostMaskFile
+     &     STREAMICEcostMaskFile,
+     &     STREAMICE_ADV_SCHEME
 
+#ifdef ALLOW_PETSC
       COMMON /PETSC_PARM_C/
      &     PETSC_SOLVER_TYPE,
      &     PETSC_PRECOND_TYPE
+#endif
+
+#ifdef ALLOW_STREAMICE_2DTRACER
+      COMMON /STREAMICE_TRAC2D_C/
+     &     STREAMICETrac2DBCxFile,
+     &     STREAMICETrac2DBCyFile,
+     &     STREAMICETrac2DinitFile
+#endif
      
 C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
 
@@ -254,7 +277,8 @@
      &     mass_ice_streamice,
      &     u_flux_bdry_SI,
      &     v_flux_bdry_SI,
-     &     h_bdry_values_SI,
+     &     h_ubdry_values_SI,
+     &     h_vbdry_values_SI,
      &     u_bdry_values_SI,
      &     v_bdry_values_SI,
      &     STREAMICE_dummy_array,
@@ -273,6 +297,17 @@
      &     streamice_vert_shear_uz, streamice_vert_shear_vz     
 #endif
 
+#ifdef ALLOW_STREAMICE_2DTRACER
+      COMMON /STREAMICE_TRAC2D_FIELDS_RL/
+     &     trac2d_ubdry_values_SI,
+     &     trac2d_vbdry_values_SI,
+     &     trac2d
+#ifdef STREAMICE_TRACER_AB
+      COMMON /STREAMICE_TRAC2D_AB_RL/
+     &     GAD_trac_2d
+#endif
+#endif
+
 #ifdef USE_ALT_RLOW
       COMMON /STREAMICE_RLOW/ 
      &     R_low_si
@@ -291,7 +326,8 @@
       _RL mass_ice_streamice    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL u_flux_bdry_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL v_flux_bdry_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
-      _RL h_bdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL h_ubdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL h_vbdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL u_bdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL v_bdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL C_basal_friction    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
@@ -318,7 +354,17 @@
       _RL streamice_vert_shear_uz (Nr)
       _RL streamice_vert_shear_vz (Nr)
 #endif      
-      
+     
+#ifdef ALLOW_STREAMICE_2DTRACER
+      _RL trac2d_ubdry_values_SI 
+     &   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL trac2d_vbdry_values_SI 
+     &   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL trac2d (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+#ifdef STREAMICE_TRACER_AB
+      _RL GAD_trac_2d (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+#endif
+#endif
       
       _RL ADOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
 !! IMPORTANT: MELT RATE IN METERS PER YEAR