Well, for a school suggestion, I can say that the University of California Santa Cruz does research in CM and CFD. They also have a really good Astrophysics program. I don't think their physics department it's self does research in CFD, but the math and applied math departments are involved in CFD and asto CFD. I believe that UC Berkeley also has some asto CFD work done in their physics and/or math departments. If you're looking at CFD, I've noticed that more math departments do that than physics.
I think in general CFD isn't a research area by it's self as you have to be computing the fluid dynamics of
something. I know there's a journal of fluid mechanics/rheology, so you could look up some articles in that and see where the people writing them are located. Also, another field that CFD is used in is Plasma Physics if that interests you. CFD in Plasma Physics (which is generally in the realm of Magnetohydro Dynamics) is what I'm looking to go to grad school for.
Links:
http://www.physics.ucsc.edu/research/index.html
http://www.math.ucsc.edu/research/index.html
http://www.ams.ucsc.edu/research/areas