Merge branch 'hotfix-erosion' into stable

ORNL-Fusion · Dec 6, 2021 · 900bfe3 · 900bfe3
2 parents 993434b + d7970ab
commit 900bfe3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/xolotl/solver/src/monitor/Monitor1D.cpp b/xolotl/solver/src/monitor/Monitor1D.cpp
@@ -1640,8 +1640,10 @@ eventFunction1D(TS ts, PetscReal time, Vec solution, PetscScalar* fvalue, void*)
 			fvalue[0] = 0;
 		}
 
+		// Update the threshold for erosion (the cell size is not the same)
+		threshold = (62.8 - initialVConc) * (grid[xi + 1] - grid[xi]);
 		// Moving the surface back
-		else if (nInterEvent1D < -threshold / 10.0) {
+		if (nInterEvent1D < -threshold * 0.9) {
 			// The surface is moving
 			fvalue[1] = 0;
 		}

diff --git a/xolotl/solver/src/monitor/Monitor2D.cpp b/xolotl/solver/src/monitor/Monitor2D.cpp
@@ -1131,14 +1131,17 @@ eventFunction2D(TS ts, PetscReal time, Vec solution, PetscScalar* fvalue, void*)
 			// the surface
 
 			// The density of tungsten is 62.8 atoms/nm3, thus the threshold is
-			double threshold = (62.8 - initialVConc) * hxLeft * hy;
+			double threshold =
+				(62.8 - initialVConc) * (grid[xi] - grid[xi - 1]) * hy;
 			if (nInterstitial2D[yj] > threshold) {
 				// The surface is moving
 				fvalue[0] = 0.0;
 			}
 
+			// Update the threshold for erosion (the cell size is not the same)
+			threshold = (62.8 - initialVConc) * (grid[xi + 1] - grid[xi]) * hy;
 			// Moving the surface back
-			else if (nInterstitial2D[yj] < -threshold / 10.0) {
+			if (nInterstitial2D[yj] < -threshold * 0.9) {
 				// The surface is moving
 				fvalue[0] = 0.0;
 			}

diff --git a/xolotl/solver/src/monitor/Monitor3D.cpp b/xolotl/solver/src/monitor/Monitor3D.cpp
@@ -1140,8 +1140,12 @@ eventFunction3D(TS ts, PetscReal time, Vec solution, PetscScalar* fvalue, void*)
 					fvalue[0] = 0.0;
 				}
 
+				// Update the threshold for erosion (the cell size is not the
+				// same)
+				threshold =
+					(62.8 - initialVConc) * (grid[xi + 1] - grid[xi]) * hy * hz;
 				// Moving the surface back
-				else if (nInterstitial3D[yj][zk] < -threshold / 10.0) {
+				if (nInterstitial3D[yj][zk] < -threshold / 10.0) {
 					// The surface is moving
 					fvalue[0] = 0.0;
 				}