Does Roman Catholicism teach that man is body and soul (bipartite) or body, soul, and spirit (tripartite)?

According to Rev. S. D. F. Salmond's English translation , John of Damascus wrote,(1) >For since **man’s nature is twofold, consisting of soul and body**, He bestowed on us a twofold purification, of water and of the Spirit: the Spirit renewing that part in us which is after His image and likeness, and the water by the grace of the Spirit cleansing the body from sin and delivering it from corruption, the water indeed expressing the image of death, but the Spirit affording the earnest of life. Does Roman Catholicism teach that a human consists of body and soul, or body, soul, and spirit?

References

(1) *Exact Exposition of the Orthodox Faith*, Book IV, Chapter IX.