Mercurial > repos > public > sbplib
changeset 368:53abf04f5e4e feature/hypsyst
Made some small changes.
| author | Ylva Rydin <ylva.rydin@telia.com> |
|---|---|
| date | Wed, 25 Jan 2017 15:37:12 +0100 |
| parents | 05947fc2505c |
| children | 9d1fc984f40d |
| files | +scheme/Hypsyst3d.m +scheme/Hypsyst3dCurve.m |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/+scheme/Hypsyst3d.m Tue Dec 27 09:11:29 2016 +0100 +++ b/+scheme/Hypsyst3d.m Wed Jan 25 15:37:12 2017 +0100 @@ -107,9 +107,9 @@ switch operator case 'upwind' - alphaA = max(eig(A(params,obj.x(end),obj.y(end),obj.z(end)))); - alphaB = max(eig(B(params,obj.x(end),obj.y(end),obj.z(end)))); - alphaC = max(eig(C(params,obj.x(end),obj.y(end),obj.z(end)))); + alphaA = max(abs(eig(A(params,obj.x(end),obj.y(end),obj.z(end))))); + alphaB = max(abs(eig(B(params,obj.x(end),obj.y(end),obj.z(end))))); + alphaC = max(abs(eig(C(params,obj.x(end),obj.y(end),obj.z(end))))); Ap = (obj.Aevaluated+alphaA*I_N)/2; Am = (obj.Aevaluated-alphaA*I_N)/2;
--- a/+scheme/Hypsyst3dCurve.m Tue Dec 27 09:11:29 2016 +0100 +++ b/+scheme/Hypsyst3dCurve.m Wed Jan 25 15:37:12 2017 +0100 @@ -12,7 +12,7 @@ Eta_xi, Zeta_xi, Xi_eta, Zeta_eta, Xi_zeta, Eta_zeta X_xi, X_eta, X_zeta,Y_xi,Y_eta,Y_zeta,Z_xi,Z_eta,Z_zeta - Aev + metric_terms @@ -140,9 +140,9 @@ switch operator case 'upwind' clear D1_xi D1_eta D1_zeta - alphaA = max(eig(obj.Ahat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_eta(end),obj.X_zeta(end),obj.Y_eta(end),obj.Y_zeta(end),obj.Z_eta(end),obj.Z_zeta(end)))); - alphaB = max(eig(obj.Bhat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_zeta(end),obj.X_xi(end),obj.Y_zeta(end),obj.Y_xi(end),obj.Z_zeta(end),obj.Z_xi(end)))); - alphaC = max(eig(obj.Chat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_xi(end),obj.X_eta(end),obj.Y_xi(end),obj.Y_eta(end),obj.Z_xi(end),obj.Z_eta(end)))); + alphaA = max(abs(eig(obj.Ahat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_eta(end),obj.X_zeta(end),obj.Y_eta(end),obj.Y_zeta(end),obj.Z_eta(end),obj.Z_zeta(end))))); + alphaB = max(abs(eig(obj.Bhat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_zeta(end),obj.X_xi(end),obj.Y_zeta(end),obj.Y_xi(end),obj.Z_zeta(end),obj.Z_xi(end))))); + alphaC = max(abs(eig(obj.Chat(obj,obj.X(end), obj.Y(end),obj.Z(end), obj.X_xi(end),obj.X_eta(end),obj.Y_xi(end),obj.Y_eta(end),obj.Z_xi(end),obj.Z_eta(end))))); Ap = (obj.Aevaluated+alphaA*I_N)/2; Dmxi = kr(I_n, ops_xi.Dm, I_eta,I_zeta); @@ -405,6 +405,7 @@ D = BM.D; e_ = BM.e_; + switch BM.boundpos case {'l'} tau = sparse(obj.n*side,pos);