--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h 2012/09/18 17:06:48 1.7 +++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h 2012/10/01 23:45:14 1.10 @@ -96,6 +96,8 @@ 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. C For now this will completely override all other boundary conditions @@ -115,7 +117,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 --------------------------------------------------- @@ -211,7 +215,11 @@ & streamice_u_surf, streamice_v_surf, & visc_streamice_full, streamice_omega, streamice_basal_geom, & streamice_vert_shear_uz, streamice_vert_shear_vz, +#ifdef USE_ALT_RLOW + & R_low_si, +#endif & streamice_sigma_coord, streamice_delsigma + _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) @@ -229,7 +237,14 @@ _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) - +#ifdef USE_ALT_RLOW + _RL R_low_si (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) +#endif + + COMMON /STREAMICE_COST_RL/ + & cost_func1_streamice + _RL cost_func1_streamice(nSx,nSy) + C The following arrays are used for the hybrid stress balance _RL streamice_taubx (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)