--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/07/24 20:49:41 1.3 +++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/07/30 19:04:55 1.5 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.3 2012/07/24 20:49:41 dgoldberg Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.5 2012/07/30 19:04:55 dgoldberg Exp $ C $Name: $ @@ -38,6 +38,7 @@ & A_glen_isothermal, n_glen, eps_glen_min, & C_basal_fric_const, n_basal_friction, & streamice_vel_update,streamice_cg_tol,streamice_nonlin_tol, + & streamice_nonlin_tol_fp, & streamice_max_cg_iter, streamice_max_nl_iter, & STREAMICE_GL_regularize, & STREAMICEthickInit, @@ -50,7 +51,8 @@ & STREAMICE_calve_to_mask, ! & STREAMICE_construct_matrix, & STREAMICE_lower_cg_tol, - & streamice_CFL_factor + & streamice_CFL_factor, + & streamice_adjDump NAMELIST /STREAMICE_PARM02/ & shelf_max_draft, @@ -98,10 +100,12 @@ streamice_vel_update = 169200. ! seconds streamice_cg_tol = 1e-6 streamice_nonlin_tol = 1e-6 + streamice_nonlin_tol_fp = 1.e-14 streamice_max_cg_iter = 2000 streamice_max_nl_iter = 100 streamice_n_sub_regularize = 4 streamice_CFL_factor = .5 + streamice_adjDump = 0. STREAMICEthickInit = 'FILE' STREAMICEthickFile = ' '