[en] This paper discusses the development of the finite element computer code SAGUARO which calculates the two-dimensional flow of mass and energy through porous media. The media may be saturated or partially saturated. SAGUARO solves the parabolic time-dependent mass transport equation which accounts for the presence of partially saturated zones through the use of highly non-linear material characteristic curves. The energy equation accounts for the possibility of partially-saturated regions by adjusting the thermal capacitances and thermal conductivities according to the volume fraction of water present in the local pores. The code capabilities are demonstrated through the presentation of a sample problem involving the one-dimensional calculation of simultaneous energy transfer and water infiltration into partially saturated hard rock