Integrating grain-scale geology in digital rock physics