--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2013/03/07 15:23:19 1.12 +++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2013/05/23 22:12:33 1.14 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.12 2013/03/07 15:23:19 dgoldberg Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.14 2013/05/23 22:12:33 dgoldberg Exp $ C $Name: $ @@ -71,12 +71,14 @@ & STREAMICEuDirichValsFile, & STREAMICEvDirichValsFile, & STREAMICEGlenConstFile, STREAMICEGlenConstConfig, + & STREAMICEBdotFile, STREAMICEBdotConfig, & STREAMICE_ppm_driving_stress, & STREAMICE_h_ctrl_const_surf, & streamice_wgt_drift,streamice_wgt_surf,streamice_wgt_vel, & streamice_wgt_avthick, streamice_wgt_tikh, & streamice_addl_backstress, - & streamice_smooth_gl_width + & streamice_smooth_gl_width, + & PETSC_PRECOND_TYPE, PETSC_SOLVER_TYPE NAMELIST /STREAMICE_PARM02/ @@ -160,8 +162,12 @@ STREAMICEuDirichValsFile = '' STREAMICEvDirichValsFile = '' STREAMICEGlenConstFile = '' + STREAMICEBdotFile = '' STREAMICEcostMaskFile = '' STREAMICEGlenConstConfig = 'UNIFORM' + STREAMICEBdotConfig = ' ' + PETSC_PRECOND_TYPE = 'PCBJACOBI' + PETSC_SOLVER_TYPE = 'KSPCG' STREAMICEison = .TRUE. STREAMICE_tave_mdsio = .TRUE.