Fixes to naming scheme

tsipkens · Jun 14, 2019 · e216ea0 · e216ea0
1 parent 1b39a41
commit e216ea0
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/+tfer_PMA/get_setpoint.m b/+tfer_PMA/get_setpoint.m
@@ -34,9 +34,9 @@
 
 if ~exist('d','var') % evaluate mechanical mobility
     warning('Invoking mass-mobility relation to determine Zp.');
-    B = tfer.mp2zp(m,z,prop.T,prop.p);
+    B = tfer_PMA.mp2zp(m,z,prop.T,prop.p);
 else
-    B = tfer.dm2zp(d,z,prop.T,prop.p);
+    B = tfer_PMA.dm2zp(d,z,prop.T,prop.p);
 end
 tau = B.*m;
 D = prop.D(B).*z; % diffusion as a function of mechanical mobiltiy and charge state
@@ -80,7 +80,7 @@
     %-- Use definition of Rm to derive angular speed at centerline -------%
     %-- See Reavell et al. (2011) for resolution definition --%
     n_B = -0.6436;
-    B_star = tfer.mp2zp(m_star,1,prop.T,prop.p); % involves invoking mass-mobility relation
+    B_star = tfer_PMA.mp2zp(m_star,1,prop.T,prop.p); % involves invoking mass-mobility relation
     sp.m_max = m_star*(1/sp.Rm+1);
     omega = sqrt(prop.Q/(m_star*B_star*2*pi*prop.rc^2*prop.L*...
         ((sp.m_max/m_star)^(n_B+1)-(sp.m_max/m_star)^n_B)));

diff --git a/+tfer_PMA/mp2zp.m b/+tfer_PMA/mp2zp.m
@@ -27,9 +27,9 @@
 
 %-- Use mobility diameter to get particle electro and mechanical mobl. ---%
 if nargin<3
-    [Zp,B] = tfer.dm2zp(d,z);
+    [Zp,B] = tfer_PMA.dm2zp(d,z);
 else
-    [Zp,B] = tfer.dm2zp(d,z,T,P);
+    [Zp,B] = tfer_PMA.dm2zp(d,z,T,P);
 end
 
 end

diff --git a/+tfer_PMA/tfer_F_diff.m b/+tfer_PMA/tfer_F_diff.m
@@ -33,7 +33,7 @@
     % integer charge state
 sig = sqrt(2.*prop.L.*D./prop.v_bar); % diffusive spreading parameter
 
-[~,G0] = tfer_PMA.tfer_CPMA_F(m_star,m,d,z,prop,varargin{:});
+[~,G0] = tfer_PMA.tfer_F(m_star,m,d,z,prop,varargin{:});
     % get G0 function for this case
 
 rho_fun = @(G,r) (G-r)./(sqrt(2).*sig); % reuccring quantity

diff --git a/main.m b/main.m
@@ -46,96 +46,96 @@
 %-- Plug flow ------------------------------------------------------------%
 %-- Method A ------------------------------%
 tic;
-[tfer_A,G0_A] = tfer_PMA.tfer_CPMA_A(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_A,G0_A] = tfer_PMA.tfer_A(m_star,m,d,z,prop,'Rm',Rm);
 t(2) = toc;
 
 %-- Method A, Ehara et al. ----------------%
-tfer_A_Ehara = tfer_PMA.tfer_CPMA_A_Ehara(m_star,m,d,z,prop,'Rm',Rm);
+tfer_A_Ehara = tfer_PMA.tfer_A_Ehara(m_star,m,d,z,prop,'Rm',Rm);
 
 %-- Method B ------------------------------%
 tic;
-[tfer_B,G0_B] = tfer_PMA.tfer_CPMA_B(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_B,G0_B] = tfer_PMA.tfer_B(m_star,m,d,z,prop,'Rm',Rm);
 t(3) = toc;
 
 %-- Method C ------------------------------%
 tic;
-[tfer_C,G0_C] = tfer_PMA.tfer_CPMA_C(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_C,G0_C] = tfer_PMA.tfer_C(m_star,m,d,z,prop,'Rm',Rm);
 t(4) = toc;
 
 %-- Method D ------------------------------%
 tic;
-[tfer_D,G0_D] = tfer_PMA.tfer_CPMA_D(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_D,G0_D] = tfer_PMA.tfer_D(m_star,m,d,z,prop,'Rm',Rm);
 t(5) = toc;
 
 %-- Method E ------------------------------%
 if prop.omega_hat==1
     tic;
-    [tfer_E,G0_E] = tfer_PMA.tfer_CPMA_E(m_star,m,d,z,prop,'Rm',Rm);
+    [tfer_E,G0_E] = tfer_PMA.tfer_E(m_star,m,d,z,prop,'Rm',Rm);
     t(6) = toc;
 end
 
 %-- Method F ------------------------------%
 tic;
-[tfer_F,G0_F] = tfer_PMA.tfer_CPMA_F(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_F,G0_F] = tfer_PMA.tfer_F(m_star,m,d,z,prop,'Rm',Rm);
 t(7) = toc;
 
 
 %-- Parabolic flow -------------------------------------------------------%
 %-- Method A ------------------------------%
 tic;
-[tfer_A_pb,G0_A_pb] = tfer_PMA.tfer_CPMA_A_pb(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_A_pb,G0_A_pb] = tfer_PMA.tfer_A_pb(m_star,m,d,z,prop,'Rm',Rm);
 t(8) = toc;
 
 %-- Method B ------------------------------%
 tic;
-[tfer_B_pb,G0_B_pb] = tfer_PMA.tfer_CPMA_B_pb(m_star,m,d,z,prop,'Rm',Rm);
+[tfer_B_pb,G0_B_pb] = tfer_PMA.tfer_B_pb(m_star,m,d,z,prop,'Rm',Rm);
 t(9) = toc;
 
 %-- Method E ------------------------------%
 if prop.omega_hat==1
     tic;
-    [tfer_E_pb,G0_E_pb] = tfer_PMA.tfer_CPMA_E_pb(m_star,m,d,z,prop,'Rm',Rm);
+    [tfer_E_pb,G0_E_pb] = tfer_PMA.tfer_E_pb(m_star,m,d,z,prop,'Rm',Rm);
     t(10) = toc;
 end
 
 
 %-- Diffusive transfer functions -----------------------------------------%
 %-- Method A ------------------------------%
 tic;
-tfer_A_diff = tfer_PMA.tfer_CPMA_A_diff(m_star,m,d,z,prop,'Rm',Rm);
+tfer_A_diff = tfer_PMA.tfer_A_diff(m_star,m,d,z,prop,'Rm',Rm);
 t(11) = toc;
 
 %-- Method B -------------------------------%
 tic;
-tfer_B_diff = tfer_PMA.tfer_CPMA_B_diff(m_star,m,d,z,prop,'Rm',Rm);
+tfer_B_diff = tfer_PMA.tfer_B_diff(m_star,m,d,z,prop,'Rm',Rm);
 t(12) = toc;
 
 %-- Method C -----------------------------%
 tic;
-tfer_C_diff = tfer_PMA.tfer_CPMA_C_diff(m_star,m,d,z,prop,'Rm',Rm);
+tfer_C_diff = tfer_PMA.tfer_C_diff(m_star,m,d,z,prop,'Rm',Rm);
 t(13) = toc;
 
 %-- Method D --------------------------------%
 tic;
-tfer_D_diff = tfer_PMA.tfer_CPMA_D_diff(m_star,m,d,z,prop,'Rm',Rm);
+tfer_D_diff = tfer_PMA.tfer_D_diff(m_star,m,d,z,prop,'Rm',Rm);
 t(14) = toc;
 
 %-- Method E --------------------------------%
 if prop.omega_hat==1
     tic;
-    tfer_E_diff = tfer_PMA.tfer_CPMA_E_diff(m_star,m,d,z,prop,'Rm',Rm);
+    tfer_E_diff = tfer_PMA.tfer_E_diff(m_star,m,d,z,prop,'Rm',Rm);
     t(15) = toc;
 end
 
 %-- Method F --------------------------------%
 tic;
-tfer_F_diff = tfer_PMA.tfer_CPMA_F_diff(m_star,m,d,z,prop,'Rm',Rm);
+tfer_F_diff = tfer_PMA.tfer_F_diff(m_star,m,d,z,prop,'Rm',Rm);
 t(16) = toc;
 
 
 %-- Triangle approx. -----------------------%
 tic;
-tfer_tri = tfer_PMA.tfer_CPMA_tri(m_star,m,d,z,prop,'Rm',Rm);
+tfer_tri = tfer_PMA.tfer_tri(m_star,m,d,z,prop,'Rm',Rm);
 t(18) = toc;