--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/10/10 02:26:48	1.15
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/01/09 21:56:17	1.18
@@ -6,16 +6,19 @@
 
       COMMON /STREAMICE_PARMS_R/ 
      & streamice_density, streamice_density_ocean_avg, 
-     & A_glen_isothermal, n_glen, eps_glen_min,
+     & A_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
      & C_basal_fric_const, n_basal_friction, streamice_input_flux_unif,
      & streamice_vel_update, streamice_cg_tol, streamice_nonlin_tol,
      & streamice_nonlin_tol_fp,
      & streamice_CFL_factor, streamice_adjDump, 
      & streamice_bg_surf_slope_x, streamice_bg_surf_slope_y,
      & streamice_kx_b_init, streamice_ky_b_init,
-     & streamice_wgt_drift, streamice_wgt_surf     
+     & streamice_wgt_drift, streamice_wgt_surf,
+     & streamice_wgt_avthick, streamice_wgt_vel, 
+     & streamice_wgt_tikh,
+     & streamice_addl_backstress
       _RL streamice_density, streamice_density_ocean_avg
-      _RL A_glen_isothermal, n_glen, eps_glen_min
+      _RL A_glen_isothermal, n_glen, eps_glen_min, eps_u_min
       _RL C_basal_fric_const
       _RL n_basal_friction 
       _RL streamice_input_flux_unif
@@ -26,7 +29,10 @@
       _RL streamice_adjDump
       _RL streamice_bg_surf_slope_x, streamice_bg_surf_slope_y
       _RL streamice_kx_b_init, streamice_ky_b_init
-      _RL streamice_wgt_drift, streamice_wgt_surf     
+      _RL streamice_wgt_drift, streamice_wgt_surf
+      _RL streamice_wgt_avthick, streamice_wgt_vel
+      _RL streamice_wgt_tikh
+      _RL streamice_addl_backstress
       
       
 C     parms for parameterized initial thickness
@@ -74,8 +80,20 @@
       CHARACTER*(MAX_LEN_FNAM) STREAMICEsigcoordFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEdelsigFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracConfig
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstConfig
       CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile
+      
+!     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) STREAMICEuFaceBdryFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile
+      
+      
       COMMON /STREAMICE_PARM_C/ 
      &     STREAMICEthickInit,
      &     STREAMICEthickFile,
@@ -85,7 +103,14 @@
      &     STREAMICEdelsigFile,
      &     STREAMICEbasalTracConfig,
      &     STREAMICEbasalTracFile,
-     &     STREAMICEvelOptimFile
+     &     STREAMICEvelOptimFile,
+     &     STREAMICEhmaskFile,
+     &     STREAMICEuFaceBdryFile,
+     &     STREAMICEvFaceBdryFile,
+     &     STREAMICEuDirichValsFile,
+     &     STREAMICEvDirichValsFile,
+     &     STREAMICEGlenConstFile,
+     &     STREAMICEGlenConstConfig
      
 C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
 
@@ -168,7 +193,8 @@
      &     STREAMICE_ufacemask_bdry,
      &     STREAMICE_vfacemask_bdry,
      &     STREAMICE_float_cond,
-     &     STREAMICE_calve_mask
+     &     STREAMICE_calve_mask,
+     &     STREAMICE_ctrl_mask
       _RS STREAMICE_hmask (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RS STREAMICE_umask (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RS STREAMICE_vmask (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
@@ -184,6 +210,8 @@
      &  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RS STREAMICE_calve_mask 
      & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RS STREAMICE_ctrl_mask 
+     & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,Nr)
      
 C    NOTES :
 C     STREAMICE_ufacemask_bdry, STREAMICE_vfacemask_bdry ARE CONSTANT (FIXED)
@@ -213,13 +241,17 @@
      &     STREAMICE_dummy_array,
      &     C_basal_friction,
      &     A_glen,
-     &     BDOT_streamice,
+     &     BDOT_streamice, ADOT_streamice,  ! mass balances in meters per year
+     &     streamice_sigma_coord, streamice_delsigma,
+     &     H_streamice_prev
+
+#ifdef STREAMICE_HYBRID_STRESS
+      COMMON /STREAMICE_HYBRID/ 
      &     streamice_taubx, streamice_tauby,
      &     streamice_u_surf, streamice_v_surf,
      &     visc_streamice_full, streamice_omega, streamice_basal_geom,
-     &     streamice_vert_shear_uz, streamice_vert_shear_vz,
-     &     streamice_sigma_coord, streamice_delsigma,
-     &     H_streamice_prev
+     &     streamice_vert_shear_uz, streamice_vert_shear_vz     
+#endif
 
 #ifdef USE_ALT_RLOW
       COMMON /STREAMICE_RLOW/ 
@@ -244,12 +276,15 @@
       _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)
       _RL A_glen    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL streamice_sigma_coord (Nr)
+      _RL streamice_delsigma (Nr)      
+
 #ifdef USE_ALT_RLOW
       _RL R_low_si    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
 #endif
 
-C      The following arrays are used for the hybrid stress balance      
-      
+C     The following arrays are used for the hybrid stress balance            
+#ifdef STREAMICE_HYBRID_STRESS      
       _RL streamice_taubx (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL streamice_tauby (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL streamice_u_surf (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
@@ -261,9 +296,10 @@
      & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
       _RL streamice_vert_shear_uz (Nr)
       _RL streamice_vert_shear_vz (Nr)
-      _RL streamice_sigma_coord (Nr)
-      _RL streamice_delsigma (Nr)
+#endif      
+      
       
+      _RL ADOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
 !! IMPORTANT: MELT RATE IN METERS PER YEAR
 !! POSITIVE WHERE MELTING
       _RL BDOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)