--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/05/14 16:47:10	1.2
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/07/30 19:04:55	1.5
@@ -9,7 +9,8 @@
      & A_glen_isothermal, n_glen, eps_glen_min,
      & C_basal_fric_const, n_basal_friction, streamice_input_flux_unif,
      & streamice_vel_update, streamice_cg_tol, streamice_nonlin_tol,
-     & streamice_CFL_factor
+     & streamice_nonlin_tol_fp,
+     & streamice_CFL_factor, streamice_adjDump
       _RL streamice_density, streamice_density_ocean_avg
       _RL A_glen_isothermal, n_glen, eps_glen_min
       _RL C_basal_fric_const
@@ -17,7 +18,9 @@
       _RL streamice_input_flux_unif
       _RL streamice_vel_update 
       _RL streamice_cg_tol, streamice_nonlin_tol
+      _RL streamice_nonlin_tol_fp
       _RL streamice_CFL_factor
+      _RL streamice_adjDump
       
 C     parms for parameterized initial thickness
 C     SHELF_MAX_DRAFT: max thickness of ice in m
@@ -44,6 +47,9 @@
 
 C     -------------------------- INT PARAMS ---------------------------------------------------
 
+      INTEGER streamice_max_nl
+      PARAMETER ( streamice_max_nl = 100 )
+
       COMMON /STREAMICE_PARMS_I/
      &     streamice_max_cg_iter, streamice_max_nl_iter,
      &     streamice_vel_upd_counter, streamice_nstep_velocity,
@@ -71,7 +77,7 @@
       LOGICAL STREAMICE_tave_mnc
       LOGICAL STREAMICE_GL_regularize, STREAMICE_move_front
       LOGICAL STREAMICE_calve_to_mask
-!       LOGICAL STREAMICE_construct_matrix
+      LOGICAL STREAMICE_construct_matrix
       LOGICAL STREAMICE_lower_cg_tol
       COMMON /STREAMICE_PARM_L/
      & STREAMICEison,
@@ -79,7 +85,7 @@
      & STREAMICE_dump_mnc, STREAMICE_tave_mnc,
      & STREAMICE_GL_regularize, STREAMICE_move_front,
      & STREAMICE_calve_to_mask,
-!     & STREAMICE_construct_matrix,
+     & STREAMICE_construct_matrix,
      & STREAMICE_lower_cg_tol
 
 C     -------------------------- AND NOW ARRAYS ---------------------------------------------------