Developments in thermal-hydraulic sub-channel modeling for whole core multi-physics simulations