Diff of /MITgcm_contrib/dgoldberg/streamice/STREAMICE.h

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/10/10 15:02:42	1.16
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/12/10 02:34:45	1.17
@@ -6,7 +6,7 @@
 
       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,
@@ -14,9 +14,10 @@
      & 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_avthick, streamice_wgt_vel
+     & streamice_wgt_avthick, streamice_wgt_vel, 
+     & 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
@@ -29,6 +30,7 @@
       _RL streamice_kx_b_init, streamice_ky_b_init
       _RL streamice_wgt_drift, streamice_wgt_surf
       _RL streamice_wgt_avthick, streamice_wgt_vel
+      _RL streamice_addl_backstress
       
       
 C     parms for parameterized initial thickness
@@ -170,7 +172,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)
@@ -186,6 +189,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)