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

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/10/10 02:26:48	1.15
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/10/10 15:02:42	1.16
@@ -13,7 +13,8 @@
      & 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
       _RL streamice_density, streamice_density_ocean_avg
       _RL A_glen_isothermal, n_glen, eps_glen_min
       _RL C_basal_fric_const
@@ -26,7 +27,8 @@
       _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
       
       
 C     parms for parameterized initial thickness
@@ -214,12 +216,16 @@
      &     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,
-     &     H_streamice_prev
+     &     streamice_vert_shear_uz, streamice_vert_shear_vz     
+#endif
 
 #ifdef USE_ALT_RLOW
       COMMON /STREAMICE_RLOW/ 
@@ -244,12 +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)
+      _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,8 +270,8 @@
      & (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