Renamed psi0 and phi0 to Psi0 and Phi0

Author: kubagalecki

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='')

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" ) ) { ?>

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>