Study on new formulation of shear strength for irregular rock joints