With a C program (header wiringPi.h) I have tested the pin cross reference. I found out a different association. In particular:

3, 5, 7, 8, 10, 11, 12, 13, 15, 16, 18, 22, 23, 24, 26 // physical pins
8, 9, 7, 28, 29, 0, 21, 2, 3, 30, 31, 6, 16, 15, 24 // wiringPi pins

I could not find the cross reference of physical 19 and 21.

Have you find it?