Turned on experimental boundary condition for contact angle

This commit is contained in:
James E McClure
2014-06-17 22:41:55 -04:00
parent f570b81416
commit 73986f2c02

View File

@@ -16,7 +16,8 @@
#include "Communication.h"
//#define CBUB
#define WRITE_SURFACES
//#define WRITE_SURFACES
#define USE_EXP_CONTACT_ANGLE
using namespace std;
@@ -494,6 +495,18 @@ int main(int argc, char **argv)
if (!pBC && rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
if (!pBC) GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
#endif
#ifdef USE_EXP_CONTACT_ANGLE
// If negative phi_s is chosen, flip the ID for the wetting and non-wetting phase
if (phi_s < 0.0 && !pBC){
phi_s = -phi_s;
das = (phi_s+1.0)*0.5;
dbs = 1.0 - das;
if (rank == 0) printf("Resetting phi_s = %f, das = %f, dbs = %f \n", phi_s, das, dbs);
FlipID(id,Nx*Ny*Nz);
}
#else
// If negative phi_s is chosen, flip the ID for the wetting and non-wetting phase
if (phi_s > 0.0 && !pBC){
phi_s = -phi_s;