Merge branch 'develop' into master

CFD-GO · Jan 9, 2024 · 91f5769 · 91f5769
2 parents 36c4007 + 8912ba1
commit 91f5769
Show file tree

Hide file tree

Showing 136 changed files with 111,178 additions and 6,915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,4 @@ p
 /*.txt
 .idea/*
 *.ipynb_checkpoint*
-test-*/
+tools/.format/*
diff --git a/example/data/karman_ARB_P00.cxn b/example/data/karman_ARB_P00.cxn
diff --git a/models/electrokinetic/d2q9_npe_guo/Dynamics.R b/models/electrokinetic/d2q9_npe_guo/Dynamics.R
@@ -99,8 +99,8 @@ AddSetting(name="el_kbT",  unit="C/J", comment='')
 AddSetting(name="epsilon",  unit="C2/J/m", comment='')
 AddSetting(name="dt", comment='')
 
-AddSetting(name="psi0",  unit="V", default=1., comment='')
-AddSetting(name="phi0",  unit="V", default=1., comment='')
+AddSetting(name="Psi0",  unit="V", default=1., comment='')
+AddSetting(name="Phi0",  unit="V", default=1., comment='')
 
 
 AddSetting(name="ez",  default=1., comment='')

diff --git a/models/electrokinetic/d2q9_npe_guo/Dynamics.c.Rt b/models/electrokinetic/d2q9_npe_guo/Dynamics.c.Rt
@@ -109,15 +109,7 @@ CudaDeviceFunction real_t getPsi(){
 	return ( <?R C( sum( g[2:9] ))  ?> ) / (1. - wp0);
 }
 
-
-//CudaDeviceFunction real_t getSubiter(){
-//	return subiter;
-//}
-
-
 CudaDeviceFunction real_t getrho_e(){
-//    const real_t psi = getPsi();
-//	return -2. * n_inf * z * el * sinh( z * el / kb/ T * psi);
     return el*(ez*getn0() - ez* getn1());	
 }
 
@@ -287,15 +279,15 @@ CudaDeviceFunction void Init() {
     real_t Jy = u.y / rho;
 
 <?R
-    psi0=PV("psi0");
-    phi0=PV("phi0");
+    Psi0=PV("Psi0");
+    Phi0=PV("Phi0");
 
-	C( g, psi0 * wp0 );
+	C( g, Psi0 * wp0 );
     C( f, feq );
 
     C( h_0, n_inf_0 * wi);
     C( h_1, n_inf_1 * wi);
-    C(phi, wp0 * phi0);
+    C(phi, wp0 * Phi0);
 ?>
 
 <?R if ( any( DensityAll$group=="BC" ) ) { ?>

diff --git a/models/electrokinetic/d2q9_npe_guo/test_0.xml b/models/electrokinetic/d2q9_npe_guo/test_0.xml
@@ -35,7 +35,7 @@
         <Params ez = "1" />
         <Params rho="1000kg/m3" />
         <Params Ex = "250V/m"  />
-        <Params psi0="0.025V" />
+        <Params Psi0="0.025V" />
         <Params psi_bc-wall="0.025V"/>
         <Params dt="1" />
 	</Model>

diff --git a/models/multiphase/d2q9_pf_velocity/Dynamics.R b/models/multiphase/d2q9_pf_velocity/Dynamics.R
@@ -86,20 +86,20 @@ if (Options$RT) {
 	AddStage("BaseInit"  , "Init_distributions" , save=Fields$group %in% c("g","h","Vel"))
 
 	# iteration
-	AddStage("BaseIter"  , "calcHydroIter"      , save=Fields$group %in% c("g","h","Vel","nw") , load=DensityAll$group %in% c("g","h","Vel","nw"))  # TODO: is nw needed here?
+	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"))	
+	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"))
 AddAction("Init"     , c("PhaseInit","WallInit", "WallIter","BaseInit"))
 
 # 	Outputs:
-AddQuantity(name="Rho",	  unit="kg/m3")
-AddQuantity(name="PhaseField",unit="1")
-AddQuantity(name="U",	  unit="m/s",vector=T)
-AddQuantity(name="NormalizedPressure",	  unit="Pa")
-AddQuantity(name="Pressure",	  unit="Pa")
+AddQuantity(name="Rho",	unit="kg/m3")
+AddQuantity(name="PhaseField", unit="1")
+AddQuantity(name="U", unit="m/s",vector=T)
+AddQuantity(name="NormalizedPressure", unit="1")
+AddQuantity(name="Pressure", unit="Pa")
 AddQuantity(name="Normal", unit="1", vector=T)
 
 #	Initialisation States
@@ -209,5 +209,4 @@ if (Options$Outflow) {
 }
 AddNodeType(name="Solid", group="BOUNDARY")
 AddNodeType(name="Wall", group="BOUNDARY")
-AddNodeType(name="BGK", group="COLLISION")
 AddNodeType(name="MRT", group="COLLISION")
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,4 @@ p @@
     /*.txt
     .idea/*
     *.ipynb_checkpoint*
-    test-*/
+    tools/.format/*