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

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/01/09 21:56:17	1.18
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/03/07 15:23:19	1.19
@@ -6,7 +6,8 @@
 
       COMMON /STREAMICE_PARMS_R/ 
      & streamice_density, streamice_density_ocean_avg, 
-     & A_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
+!     & A_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
+     & B_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,
@@ -16,9 +17,11 @@
      & streamice_wgt_drift, streamice_wgt_surf,
      & streamice_wgt_avthick, streamice_wgt_vel, 
      & streamice_wgt_tikh,
-     & streamice_addl_backstress
+     & streamice_addl_backstress,
+     & streamice_smooth_gl_width
       _RL streamice_density, streamice_density_ocean_avg
-      _RL A_glen_isothermal, n_glen, eps_glen_min, eps_u_min
+!      _RL A_glen_isothermal, n_glen, eps_glen_min, eps_u_min
+      _RL B_glen_isothermal, n_glen, eps_glen_min, eps_u_min
       _RL C_basal_fric_const
       _RL n_basal_friction 
       _RL streamice_input_flux_unif
@@ -33,6 +36,7 @@
       _RL streamice_wgt_avthick, streamice_wgt_vel
       _RL streamice_wgt_tikh
       _RL streamice_addl_backstress
+      _RL streamice_smooth_gl_width
       
       
 C     parms for parameterized initial thickness
@@ -84,6 +88,8 @@
       CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEtopogFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEcostMaskFile
       
 !     THE FOLLOWING FILENAMES ARE FOR SPECIFYING IRREGULAR DOMAIN GEOMETRIES 
 !     (i.e. boundaries that do not conform with rectangular walls)
@@ -104,13 +110,15 @@
      &     STREAMICEbasalTracConfig,
      &     STREAMICEbasalTracFile,
      &     STREAMICEvelOptimFile,
+     &     STREAMICEtopogFile,
      &     STREAMICEhmaskFile,
      &     STREAMICEuFaceBdryFile,
      &     STREAMICEvFaceBdryFile,
      &     STREAMICEuDirichValsFile,
      &     STREAMICEvDirichValsFile,
      &     STREAMICEGlenConstFile,
-     &     STREAMICEGlenConstConfig
+     &     STREAMICEGlenConstConfig,
+     &     STREAMICEcostMaskFile
      
 C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
 
@@ -194,7 +202,8 @@
      &     STREAMICE_vfacemask_bdry,
      &     STREAMICE_float_cond,
      &     STREAMICE_calve_mask,
-     &     STREAMICE_ctrl_mask
+     &     STREAMICE_ctrl_mask,
+     &     STREAMICE_cost_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)
@@ -211,7 +220,9 @@
       _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)
+     & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
+      _RS STREAMICE_cost_mask 
+     & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
      
 C    NOTES :
 C     STREAMICE_ufacemask_bdry, STREAMICE_vfacemask_bdry ARE CONSTANT (FIXED)
@@ -240,7 +251,8 @@
      &     v_bdry_values_SI,
      &     STREAMICE_dummy_array,
      &     C_basal_friction,
-     &     A_glen,
+!     &     A_glen,
+     &     B_glen,
      &     BDOT_streamice, ADOT_streamice,  ! mass balances in meters per year
      &     streamice_sigma_coord, streamice_delsigma,
      &     H_streamice_prev
@@ -275,7 +287,8 @@
       _RL u_bdry_values_SI    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _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 A_glen    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      _RL B_glen    (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       _RL streamice_sigma_coord (Nr)
       _RL streamice_delsigma (Nr)