A PhD thesis is available at LMSF lab of CEA in collaboration with Storengy, a world specialist in natural gas storage in salt caverns. Measurements carried out in the cavity showed that gas is in convective motion in the upper part of the cavity and is not necessarily in thermodynamic equilibrium with the brine at the bottom of the cavity, leading to gas stratification phenomena. The different flow regimes (convective or not) will strongly influence, on the one hand, mass exchanges between the gas and the brine and therefore the evolution of the gas composition (in moisture and other components) at the cavity exit and, on the other hand, thermal exchanges between the gas and the rock mass surrounding the cavity. In this context, CFD-based prediction tools are highly beneficial for understanding these phenomena and will contribute to a better interpretation of the physical measurements made in the cavity, to the design improvment of surface installations and to monitoring storage facilities, particularly for hydrogen storage. In this doctoral project, the aim is to develop a thermal-hydraulics model based on TrioCFD software for gas storage in realistically-shaped cavities and under cavity operating conditions (injection and withdrawal phases). To this end, the operation of storage salt cavities will be modeled, initially for a real geometry and in single-phase flow, then in two-phase flow, taking into account mass exchanges between the brine and the gas in the cavity.