[2pnc][2pncmin] generalize liquid/gas to wetting/nonwetting

This concerns comments, output and local variable names.
Also fix some comments where liquid has been used instead of gas.

(cherry picked from commit cc2f9ee2)