merge nonzero_gli_term_for_nonwetting_in_TPR
old gli terms for TPR coupling
new interface terms
version before reimplementing communication and calculation of gli