merge
fix gas function volumetric flow rates