--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/09/26 15:16:51	1.8
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/10/10 15:02:42	1.16
@@ -1,4 +1,4 @@
-C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
+C---+----1--+-+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
 
 #ifdef ALLOW_STREAMICE
 
@@ -12,7 +12,9 @@
      & 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_kx_b_init, streamice_ky_b_init,
+     & streamice_wgt_drift, streamice_wgt_surf,
+     & streamice_wgt_avthick, streamice_wgt_vel
       _RL streamice_density, streamice_density_ocean_avg
       _RL A_glen_isothermal, n_glen, eps_glen_min
       _RL C_basal_fric_const
@@ -25,6 +27,9 @@
       _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_avthick, streamice_wgt_vel
+      
       
 C     parms for parameterized initial thickness
 C     SHELF_MAX_DRAFT: max thickness of ice in m
@@ -96,6 +101,7 @@
       LOGICAL STREAMICE_construct_matrix
       LOGICAL STREAMICE_lower_cg_tol
       LOGICAL STREAMICE_diagnostic_only
+      LOGICAL STREAMICE_ppm_driving_stress
       LOGICAL STREAMICE_h_ctrl_const_surf
       
 C     The following parameters specify periodic boundary conditions. 
@@ -116,7 +122,9 @@
      & STREAMICE_construct_matrix,
      & STREAMICE_lower_cg_tol,
      & STREAMICE_NS_periodic, STREAMICE_EW_periodic,
-     & STREAMICE_diagnostic_only
+     & STREAMICE_diagnostic_only,
+     & STREAMICE_ppm_driving_stress,
+     & STREAMICE_h_ctrl_const_surf
 
 C     -------------------------- AND NOW ARRAYS ---------------------------------------------------
 
@@ -208,11 +216,23 @@
      &     C_basal_friction,
      &     A_glen,
      &     BDOT_streamice,
+     &     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
+     &     streamice_vert_shear_uz, streamice_vert_shear_vz     
+#endif
+
+#ifdef USE_ALT_RLOW
+      COMMON /STREAMICE_RLOW/ 
+     &     R_low_si
+#endif
+
+
       _RL H_streamice           (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL U_streamice           (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL V_streamice           (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
@@ -230,9 +250,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)
-      
-C      The following arrays are used for the hybrid stress balance      
-      
+      _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            
+#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)
@@ -244,15 +270,21 @@
      & (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      
+      
       
 !! IMPORTANT: MELT RATE IN METERS PER YEAR
 !! POSITIVE WHERE MELTING
       _RL BDOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
-      
+      _RL H_streamice_prev (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL STREAMICE_dummy_array (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       
+      
+           
+      COMMON /STREAMICE_COST_RL/
+     &       cost_func1_streamice
+      _RL cost_func1_streamice(nSx,nSy)
+      
 C    NOTES :
 C      REAL ARRAYS THAT COMPRISE "STATE":
 C       H_streamice,