sounds like waterpump or a pulley issue. remove the fan and take off the serpentine belts and see if the noise goes away. Don't run it very long like that because you won't be circulating water. the diesel noise sounds like VANOS.

__________________
*********************
Olympic Peninsula, WA, USA
-----------------------------------------
2005 Mini Cooper 100k, British Racing Green/Silver-Black
04/2002 4.6is 140k, Silver/Black-Alcantara *FOR SALE*
1989 325iX 270k, Diamond Black/Black
1984 318i 370k *SOLD* (First Bimmer)
Honorable Mentions: '71 2002, '87 325, '90 325ic, '92 525it, '93 325i, '94 530i