+ add nan flag for cart grid as well for consistent behaviour

CFD-GO · Dec 20, 2023 · 8a8a277 · 8a8a277
1 parent bcad0ef
commit 8a8a277
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/models/multiphase/d2q9_pf_velocity/Dynamics.R b/models/multiphase/d2q9_pf_velocity/Dynamics.R
@@ -88,7 +88,7 @@ if (Options$RT) {
 	# iteration
 	AddStage("BaseIter"  , "calcHydroIter"      , save=Fields$group %in% c("g","h","Vel","nw") , load=DensityAll$group %in% c("PF","g","h","Vel","nw"))  # TODO: is nw needed here?
 	AddStage("PhaseIter" , "calcPhaseFIter"		, save=Fields$group %in% c("PF")			   , load=DensityAll$group %in% c("g","h","Vel","nw"))
-	AddStage("WallIter"  , "calcWallPhaseIter"	, save=Fields$group %in% c("PF")			   , load=DensityAll$group %in% c("nw","PF"))	
+	AddStage("WallIter"  , "calcWallPhaseIter"	, save=Fields$group %in% c("PF")			   , load=DensityAll$group %in% c("nw","PF"))	# Purposefully read/write of PF for boundary. complex geom may force RACE condition.
 }
 
 AddAction("Iteration", c("BaseIter", "PhaseIter","WallIter"))

diff --git a/models/multiphase/d2q9_pf_velocity/Dynamics.c.Rt b/models/multiphase/d2q9_pf_velocity/Dynamics.c.Rt
@@ -221,17 +221,15 @@ CudaDeviceFunction real_t calcMu(real_t myPhase){
 		}
 	#endif
 
-	// eq 5 from "Improved locality of the phase-field lattice Boltzmann 
-	// model for immiscible fluids at high density ratios"
+	// eq 5 from "Improved locality of the phase-field lattice Boltzmann model for immiscible fluids at high density ratios"
 	real_t pfavg = 0.5*(PhaseField_l+PhaseField_h);
 	real_t mu = 4.0*(12.0*sigma/W)*(myPhase-PhaseField_l)*(myPhase-PhaseField_h)*(myPhase-pfavg)
 		        - (1.5 *sigma*W) * lpPhi; 
 	return mu;
 }
 
 CudaDeviceFunction real_t calcGamma(int i, real_t u, real_t v, real_t u2mag){
-	// eq 10 from "Improved locality of the phase-field lattice Boltzmann 
-	// model for immiscible fluids at high density ratios"
+	// eq 10 from "Improved locality of the phase-field lattice Boltzmann model for immiscible fluids at high density ratios"
 	real_t gamma, tmp;
 	tmp = (d2q9_ex[i]*u+d2q9_ey[i]*v);
 
@@ -240,8 +238,7 @@ CudaDeviceFunction real_t calcGamma(int i, real_t u, real_t v, real_t u2mag){
 }
 
 CudaDeviceFunction real_t calcF_phi(int i, real_t numerator, real_t nx, real_t ny){
-	// eq 7 from "Improved locality of the phase-field lattice Boltzmann 
-	// model for immiscible fluids at high density ratios"
+	// eq 7 from "Improved locality of the phase-field lattice Boltzmann model for immiscible fluids at high density ratios"
 
 	// nx: normalized PhaseField gradient in x direction
 	// this method calculates F_phi in [0-9] lattice coord
@@ -252,8 +249,7 @@ CudaDeviceFunction real_t calcF_phi(int i, real_t numerator, real_t nx, real_t n
 }
 
 CudaDeviceFunction vector_t calcF_phi_xy(vector_t gradPhi, real_t myPhaseF, real_t pfavg){	
-	// eq 7 from "Improved locality of the phase-field lattice Boltzmann 
-	// model for immiscible fluids at high density ratios"
+	// eq 7 from "Improved locality of the phase-field lattice Boltzmann model for immiscible fluids at high density ratios"
 
 	// this method calculates F_phi in x,y coordinates
 	real_t nx = gradPhi.x/gradPhi.z;  // GradPhi normalized in x, y direction
@@ -540,8 +536,8 @@ CudaDeviceFunction void calcWallPhaseIter(){
 
 	if ((NodeType & NODE_BOUNDARY) == NODE_Wall) {
 		if (nw_x == 0 && nw_y == 0) { 
-			PhaseF = 0.0;
-			printf("EDGE CASE: Solid found with no normal at (%.1f %.1f)\n", X, Y);
+			PhaseF = NAN;
+			//printf("EDGE CASE: Solid found with no normal at (%.1f %.1f)\n", X, Y);
 			return;
 		} 
 		real_t myA, myPhase;