sbplib: +scheme/Hypsyst3dCurve.m annotate

annotate +scheme/Hypsyst3dCurve.m @ 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	7ada2db63268
children	9d1fc984f40d

rev	line source
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	1 classdef Hypsyst3dCurve < scheme.Scheme
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	2 properties
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	3 m % Number of points in each direction, possibly a vector
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	4 n %size of system
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	5 h % Grid spacing
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	6 X, Y, Z% Values of x and y for each grid point
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	7 Yx, Zx, Xy, Zy, Xz, Yz %Grid values for boundary surfaces
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	8
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	9 xi,eta,zeta
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	10 Xi, Eta, Zeta
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	11
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	12 Eta_xi, Zeta_xi, Xi_eta, Zeta_eta, Xi_zeta, Eta_zeta
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	13
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	14 X_xi, X_eta, X_zeta,Y_xi,Y_eta,Y_zeta,Z_xi,Z_eta,Z_zeta
368 53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 366 diff changeset	15
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	16
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	17 metric_terms
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	18
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	19 order % Order accuracy for the approximation
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	20
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	21 D % non-stabalized scheme operator
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	22 Aevaluated, Bevaluated, Cevaluated, Eevaluated
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	23 Ahat, Bhat, Chat, E
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	24 A,B,C
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	25
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	26 J, Ji
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	27
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	28 H % Discrete norm
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	29 % Norms in the x, y and z directions
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	30 Hxii,Hetai,Hzetai, Hzi % Kroneckerd norms. 1'Hxv corresponds to integration in the x dir.
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	31 Hxi,Heta,Hzeta
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	32 I_xi,I_eta,I_zeta, I_N,onesN
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	33 e_w, e_e, e_s, e_n, e_b, e_t
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	34 index_w, index_e,index_s,index_n, index_b, index_t
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	35 params %parameters for the coeficient matrice
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	36 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	37
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	38
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	39 methods
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	40 function obj = Hypsyst3dCurve(m, order, A, B,C, E, params,ti,operator)
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	41 xilim ={0 1};
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	42 etalim = {0 1};
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	43 zetalim = {0 1};
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	44
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	45 if length(m) == 1
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	46 m = [m m m];
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	47 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	48 m_xi = m(1);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	49 m_eta = m(2);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	50 m_zeta = m(3);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	51 m_tot = m_xim_etam_zeta;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	52 obj.params = params;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	53 obj.n = length(A(obj,0,0,0));
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	54
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	55 obj.m = m;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	56 obj.order = order;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	57 obj.onesN = ones(obj.n);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	58
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	59 switch operator
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	60 case 'upwind'
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	61 ops_xi = sbp.D1Upwind(m_xi,xilim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	62 ops_eta = sbp.D1Upwind(m_eta,etalim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	63 ops_zeta = sbp.D1Upwind(m_zeta,zetalim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	64 case 'standard'
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	65 ops_xi = sbp.D2Standard(m_xi,xilim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	66 ops_eta = sbp.D2Standard(m_eta,etalim,order);
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	67 ops_zeta = sbp.D2Standard(m_zeta,zetalim,order);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	68 otherwise
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	69 error('Operator not available')
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	70 end
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	71
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	72 obj.xi = ops_xi.x;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	73 obj.eta = ops_eta.x;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	74 obj.zeta = ops_zeta.x;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	75
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	76 obj.Xi = kr(obj.xi,ones(m_eta,1),ones(m_zeta,1));%% Que pasa?
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	77 obj.Eta = kr(ones(m_xi,1),obj.eta,ones(m_zeta,1));
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	78 obj.Zeta = kr(ones(m_xi,1),ones(m_eta,1),obj.zeta);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	79
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	80
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	81 [X,Y,Z] = ti.map(obj.Xi,obj.Eta,obj.Zeta);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	82 obj.X = X;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	83 obj.Y = Y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	84 obj.Z = Z;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	85
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	86 I_n = eye(obj.n);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	87 I_xi = speye(m_xi);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	88 obj.I_xi = I_xi;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	89 I_eta = speye(m_eta);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	90 obj.I_eta = I_eta;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	91 I_zeta = speye(m_zeta);
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	92 obj.I_zeta = I_zeta;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	93
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	94 I_N=kr(I_n,I_xi,I_eta,I_zeta);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	95
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	96 O_xi = ones(m_xi,1);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	97 O_eta = ones(m_eta,1);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	98 O_zeta = ones(m_zeta,1);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	99
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	100
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	101 obj.Hxi = ops_xi.H;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	102 obj.Heta = ops_eta.H;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	103 obj.Hzeta = ops_zeta.H;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	104 obj.h = [ops_xi.h ops_eta.h ops_zeta.h];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	105
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	106 switch operator
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	107 case 'upwind'
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	108 D1_xi = kr((ops_xi.Dp+ops_xi.Dm)/2, I_eta,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	109 D1_eta = kr(I_xi, (ops_eta.Dp+ops_eta.Dm)/2,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	110 D1_zeta = kr(I_xi, I_eta,(ops_zeta.Dp+ops_zeta.Dm)/2);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	111 otherwise
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	112 D1_xi = kr(ops_xi.D1, I_eta,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	113 D1_eta = kr(I_xi, ops_eta.D1,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	114 D1_zeta = kr(I_xi, I_eta,ops_zeta.D1);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	115 end
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	116
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	117 obj.A = A;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	118 obj.B = B;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	119 obj.C = C;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	120
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	121 obj.X_xi = D1_xi*X;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	122 obj.X_eta = D1_eta*X;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	123 obj.X_zeta = D1_zeta*X;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	124 obj.Y_xi = D1_xi*Y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	125 obj.Y_eta = D1_eta*Y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	126 obj.Y_zeta = D1_zeta*Y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	127 obj.Z_xi = D1_xi*Z;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	128 obj.Z_eta = D1_eta*Z;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	129 obj.Z_zeta = D1_zeta*Z;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	130
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	131 obj.Ahat = @transform_coefficient_matrix;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	132 obj.Bhat = @transform_coefficient_matrix;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	133 obj.Chat = @transform_coefficient_matrix;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	134 obj.E = @(obj,x,y,z,~,~,~,~,~,~)E(obj,x,y,z);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	135
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	136 obj.Aevaluated = obj.evaluateCoefficientMatrix(obj.Ahat,obj.X, obj.Y,obj.Z, obj.X_eta,obj.X_zeta,obj.Y_eta,obj.Y_zeta,obj.Z_eta,obj.Z_zeta);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	137 obj.Bevaluated = obj.evaluateCoefficientMatrix(obj.Bhat,obj.X, obj.Y,obj.Z, obj.X_zeta,obj.X_xi,obj.Y_zeta,obj.Y_xi,obj.Z_zeta,obj.Z_xi);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	138 obj.Cevaluated = obj.evaluateCoefficientMatrix(obj.Chat,obj.X,obj.Y,obj.Z, obj.X_xi,obj.X_eta,obj.Y_xi,obj.Y_eta,obj.Z_xi,obj.Z_eta);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	139
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	140 switch operator
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	141 case 'upwind'
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	142 clear D1_xi D1_eta D1_zeta
368 53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 366 diff changeset	143 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)))));
53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 366 diff changeset	144 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)))));
53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 366 diff changeset	145 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)))));
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	146
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	147 Ap = (obj.Aevaluated+alphaA*I_N)/2;
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	148 Dmxi = kr(I_n, ops_xi.Dm, I_eta,I_zeta);
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	149 diffSum=-Ap*Dmxi;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	150 clear Ap Dmxi
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	151
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	152 Am = (obj.Aevaluated-alphaA*I_N)/2;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	153 obj.Aevaluated=[];
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	154 Dpxi = kr(I_n, ops_xi.Dp, I_eta,I_zeta);
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	155 temp=Am*Dpxi;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	156 diffSum=diffSum-temp;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	157 clear Am Dpxi
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	158
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	159 Bp = (obj.Bevaluated+alphaB*I_N)/2;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	160 Dmeta = kr(I_n, I_xi, ops_eta.Dm,I_zeta);
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	161 temp=Bp*Dmeta;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	162 diffSum=diffSum-temp;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	163 clear Bp Dmeta
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	164
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	165 Bm = (obj.Bevaluated-alphaB*I_N)/2;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	166 obj.Bevaluated=[];
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	167 Dpeta = kr(I_n, I_xi, ops_eta.Dp,I_zeta);
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	168 temp=Bm*Dpeta;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	169 diffSum=diffSum-temp;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	170 clear Bm Dpeta
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	171
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	172
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	173 Cp = (obj.Cevaluated+alphaC*I_N)/2;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	174 Dmzeta = kr(I_n, I_xi, I_eta,ops_zeta.Dm);
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	175 temp=Cp*Dmzeta;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	176 diffSum=diffSum-temp;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	177 clear Cp Dmzeta
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	178
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	179 Cm = (obj.Cevaluated-alphaC*I_N)/2;
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	180 clear I_N
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	181 obj.Cevaluated=[];
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	182 Dpzeta = kr(I_n, I_xi, I_eta,ops_zeta.Dp);
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	183 temp=Cm*Dpzeta;
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	184 diffSum=diffSum-temp;
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	185 clear Cm Dpzeta temp
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	186
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	187
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	188 obj.J = obj.X_xi.obj.Y_eta.obj.Z_zeta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	189 +obj.X_zeta.obj.Y_xi.obj.Z_eta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	190 +obj.X_eta.obj.Y_zeta.obj.Z_xi...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	191 -obj.X_xi.obj.Y_zeta.obj.Z_eta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	192 -obj.X_eta.obj.Y_xi.obj.Z_zeta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	193 -obj.X_zeta.obj.Y_eta.obj.Z_xi;
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	194
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	195 obj.Ji = kr(I_n,spdiags(1./obj.J,0,m_tot,m_tot));
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	196 obj.Eevaluated = obj.evaluateCoefficientMatrix(obj.E, obj.X, obj.Y,obj.Z,[],[],[],[],[],[]);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	197
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	198 obj.D = obj.Ji*diffSum-obj.Eevaluated;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	199 otherwise
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	200 D1_xi=kr(I_n,D1_xi);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	201 D1_eta=kr(I_n,D1_eta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	202 D1_zeta=kr(I_n,D1_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	203
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	204 obj.J = obj.X_xi.obj.Y_eta.obj.Z_zeta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	205 +obj.X_zeta.obj.Y_xi.obj.Z_eta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	206 +obj.X_eta.obj.Y_zeta.obj.Z_xi...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	207 -obj.X_xi.obj.Y_zeta.obj.Z_eta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	208 -obj.X_eta.obj.Y_xi.obj.Z_zeta...
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	209 -obj.X_zeta.obj.Y_eta.obj.Z_xi;
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	210
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	211 obj.Ji = kr(I_n,spdiags(1./obj.J,0,m_tot,m_tot));
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	212 obj.Eevaluated = obj.evaluateCoefficientMatrix(obj.E, obj.X, obj.Y,obj.Z,[],[],[],[],[],[]);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	213
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	214 obj.D = obj.Ji(-obj.AevaluatedD1_xi-obj.BevaluatedD1_eta -obj.CevaluatedD1_zeta)-obj.Eevaluated;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	215 end
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	216 obj.Hxii = kr(I_n, ops_xi.HI, I_eta,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	217 obj.Hetai = kr(I_n, I_xi, ops_eta.HI,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	218 obj.Hzetai = kr(I_n, I_xi,I_eta, ops_zeta.HI);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	219
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	220 obj.index_w = (kr(ops_xi.e_l, O_eta,O_zeta)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	221 obj.index_e = (kr(ops_xi.e_r, O_eta,O_zeta)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	222 obj.index_s = (kr(O_xi, ops_eta.e_l,O_zeta)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	223 obj.index_n = (kr(O_xi, ops_eta.e_r,O_zeta)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	224 obj.index_b = (kr(O_xi, O_eta, ops_zeta.e_l)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	225 obj.index_t = (kr(O_xi, O_eta, ops_zeta.e_r)==1);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	226
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	227 obj.e_w = kr(I_n, ops_xi.e_l, I_eta,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	228 obj.e_e = kr(I_n, ops_xi.e_r, I_eta,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	229 obj.e_s = kr(I_n, I_xi, ops_eta.e_l,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	230 obj.e_n = kr(I_n, I_xi, ops_eta.e_r,I_zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	231 obj.e_b = kr(I_n, I_xi, I_eta, ops_zeta.e_l);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	232 obj.e_t = kr(I_n, I_xi, I_eta, ops_zeta.e_r);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	233
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	234
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	235
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	236 obj.Eta_xi = kr(obj.eta,ones(m_xi,1));
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	237 obj.Zeta_xi = kr(ones(m_eta,1),obj.zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	238 obj.Xi_eta = kr(obj.xi,ones(m_zeta,1));
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	239 obj.Zeta_eta = kr(ones(m_xi,1),obj.zeta);
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	240 obj.Xi_zeta = kr(obj.xi,ones(m_eta,1));
7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	241 obj.Eta_zeta = kr(ones(m_zeta,1),obj.eta);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	242
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	243 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	244
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	245 function [ret] = transform_coefficient_matrix(obj,x,y,z,x_1,x_2,y_1,y_2,z_1,z_2)
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	246 ret = obj.A(obj,x,y,z).(y_1.z_2-z_1.*y_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	247 ret = ret+obj.B(obj,x,y,z).(x_2.z_1-x_1.*z_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	248 ret = ret+obj.C(obj,x,y,z).(x_1.y_2-x_2.*y_1);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	249 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	250
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	251
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	252 % Closure functions return the opertors applied to the own doamin to close the boundary
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	253 % Penalty functions return the opertors to force the solution. In the case of an interface it returns the operator applied to the other doamin.
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	254 % boundary is a string specifying the boundary e.g. 'l','r' or 'e','w','n','s'.
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	255 % type is a string specifying the type of boundary condition if there are several.
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	256 % data is a function returning the data that should be applied at the boundary.
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	257 function [closure, penalty] = boundary_condition(obj,boundary,type,L)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	258 default_arg('type','char');
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	259 BM = boundary_matrices(obj,boundary);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	260
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	261 switch type
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	262 case{'c','char'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	263 [closure,penalty] = boundary_condition_char(obj,BM);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	264 case{'general'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	265 [closure,penalty] = boundary_condition_general(obj,BM,boundary,L);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	266 otherwise
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	267 error('No such boundary condition')
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	268 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	269 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	270
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	271 function [closure, penalty] = interface(obj,boundary,neighbour_scheme,neighbour_boundary)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	272 error('An interface function does not exist yet');
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	273 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	274
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	275 function N = size(obj)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	276 N = obj.m;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	277 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	278
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	279 function [ret] = evaluateCoefficientMatrix(obj,mat, X, Y, Z , x_1 , x_2 , y_1 , y_2 , z_1 , z_2)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	280 params = obj.params;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	281 side = max(length(X),length(Y));
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	282 if isa(mat,'function_handle')
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	283 [rows,cols] = size(mat(obj,0,0,0,0,0,0,0,0,0));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	284 x_1 = kr(obj.onesN,x_1);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	285 x_2 = kr(obj.onesN,x_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	286 y_1 = kr(obj.onesN,y_1);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	287 y_2 = kr(obj.onesN,y_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	288 z_1 = kr(obj.onesN,z_1);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	289 z_2 = kr(obj.onesN,z_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	290 matVec = mat(obj,X',Y',Z',x_1',x_2',y_1',y_2',z_1',z_2');
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	291 matVec = sparse(matVec);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	292 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	293 matVec = mat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	294 [rows,cols] = size(matVec);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	295 side = max(length(X),length(Y));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	296 cols = cols/side;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	297 end
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	298 matVec(abs(matVec)<10^(-10))=0;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	299 ret = cell(rows,cols);
351 7cc3d5bd3692 Curve linear code in 3D converges for manufactures solution Ylva Rydin <ylva.rydin@telia.com> parents: 350 diff changeset	300
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	301
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	302 for ii=1:rows
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	303 for jj=1:cols
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	304 ret{ii,jj} = diag(matVec(ii,(jj-1)side+1:jjside));
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	305 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	306 end
351 7cc3d5bd3692 Curve linear code in 3D converges for manufactures solution Ylva Rydin <ylva.rydin@telia.com> parents: 350 diff changeset	307
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	308 ret = cell2mat(ret);
366 7ada2db63268 Tried to speed up the matrix set-up a little Ylva Rydin <ylva.rydin@telia.com> parents: 355 diff changeset	309
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	310 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	311
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	312
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	313 function [BM] = boundary_matrices(obj,boundary)
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	314 params = obj.params;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	315 BM.boundary = boundary;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	316 switch boundary
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	317 case {'w','W','west'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	318 BM.e_ = obj.e_w;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	319 mat = obj.Ahat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	320 BM.boundpos = 'l';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	321 BM.Hi = obj.Hxii;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	322 BM.index = obj.index_w;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	323 BM.x_1 = obj.X_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	324 BM.x_2 = obj.X_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	325 BM.y_1 = obj.Y_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	326 BM.y_2 = obj.Y_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	327 BM.z_1 = obj.Z_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	328 BM.z_2 = obj.Z_zeta(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	329 case {'e','E','east'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	330 BM.e_ = obj.e_e;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	331 mat = obj.Ahat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	332 BM.boundpos = 'r';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	333 BM.Hi = obj.Hxii;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	334 BM.index = obj.index_e;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	335 BM.x_1 = obj.X_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	336 BM.x_2 = obj.X_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	337 BM.y_1 = obj.Y_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	338 BM.y_2 = obj.Y_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	339 BM.z_1 = obj.Z_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	340 BM.z_2 = obj.Z_zeta(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	341 case {'s','S','south'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	342 BM.e_ = obj.e_s;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	343 mat = obj.Bhat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	344 BM.boundpos = 'l';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	345 BM.Hi = obj.Hetai;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	346 BM.index = obj.index_s;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	347 BM.x_1 = obj.X_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	348 BM.x_2 = obj.X_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	349 BM.y_1 = obj.Y_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	350 BM.y_2 = obj.Y_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	351 BM.z_1 = obj.Z_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	352 BM.z_2 = obj.Z_xi(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	353 case {'n','N','north'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	354 BM.e_ = obj.e_n;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	355 mat = obj.Bhat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	356 BM.boundpos = 'r';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	357 BM.Hi = obj.Hetai;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	358 BM.index = obj.index_n;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	359 BM.x_1 = obj.X_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	360 BM.x_2 = obj.X_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	361 BM.y_1 = obj.Y_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	362 BM.y_2 = obj.Y_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	363 BM.z_1 = obj.Z_zeta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	364 BM.z_2 = obj.Z_xi(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	365 case{'b','B','Bottom'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	366 BM.e_ = obj.e_b;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	367 mat = obj.Chat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	368 BM.boundpos = 'l';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	369 BM.Hi = obj.Hzetai;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	370 BM.index = obj.index_b;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	371 BM.x_1 = obj.X_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	372 BM.x_2 = obj.X_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	373 BM.y_1 = obj.Y_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	374 BM.y_2 = obj.Y_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	375 BM.z_1 = obj.Z_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	376 BM.z_2 = obj.Z_eta(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	377 case{'t','T','Top'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	378 BM.e_ = obj.e_t;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	379 mat = obj.Chat;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	380 BM.boundpos = 'r';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	381 BM.Hi = obj.Hzetai;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	382 BM.index = obj.index_t;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	383 BM.x_1 = obj.X_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	384 BM.x_2 = obj.X_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	385 BM.y_1 = obj.Y_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	386 BM.y_2 = obj.Y_eta(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	387 BM.z_1 = obj.Z_xi(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	388 BM.z_2 = obj.Z_eta(BM.index);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	389 end
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	390 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.X(BM.index),obj.Y(BM.index),obj.Z(BM.index),...
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	391 BM.x_1,BM.x_2,BM.y_1,BM.y_2,BM.z_1,BM.z_2);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	392 BM.side = sum(BM.index);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	393 BM.pos = signVec(1); BM.zeroval=signVec(2); BM.neg=signVec(3);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	394 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	395
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	396
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	397 function [closure, penalty]=boundary_condition_char(obj,BM)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	398 side = BM.side;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	399 pos = BM.pos;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	400 neg = BM.neg;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	401 zeroval = BM.zeroval;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	402 V = BM.V;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	403 Vi = BM.Vi;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	404 Hi = BM.Hi;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	405 D = BM.D;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	406 e_ = BM.e_;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	407
368 53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 366 diff changeset	408
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	409 switch BM.boundpos
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	410 case {'l'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	411 tau = sparse(obj.n*side,pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	412 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	413 tau(1:pos,:) = -abs(D(1:pos,1:pos));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	414 closure = Hie_VtauVi_plus*e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	415 penalty = -Hie_VtauVi_plus;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	416 case {'r'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	417 tau = sparse(obj.n*side,neg);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	418 tau((pos+zeroval)+1:obj.nside,:) = -abs(D((pos+zeroval)+1:obj.nside,(pos+zeroval)+1:obj.n*side));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	419 Vi_minus = Vi((pos+zeroval)+1:obj.n*side,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	420 closure = Hie_VtauVi_minus*e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	421 penalty = -Hie_VtauVi_minus;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	422 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	423 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	424
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	425
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	426 function [closure,penalty]=boundary_condition_general(obj,BM,boundary,L)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	427 side = BM.side;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	428 pos = BM.pos;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	429 neg = BM.neg;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	430 zeroval = BM.zeroval;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	431 V = BM.V;
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	432 Vi = BM.Vi;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	433 Hi = BM.Hi;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	434 D = BM.D;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	435 e_ = BM.e_;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	436 index = BM.index;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	437
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	438 switch BM.boundary
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	439 case{'b','B','bottom'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	440 Ji_vec = diag(obj.Ji);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	441 Ji = diag(Ji_vec(index));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	442 Zeta_x = Ji(obj.Y_xi(index).obj.Z_eta(index)-obj.Z_xi(index).*obj.Y_eta(index));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	443 Zeta_y = Ji(obj.X_eta(index).obj.Z_xi(index)-obj.X_xi(index).*obj.Z_eta(index));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	444 Zeta_z = Ji(obj.X_xi(index).obj.Y_eta(index)-obj.Y_xi(index).*obj.X_eta(index));
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	445
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	446 L = obj.evaluateCoefficientMatrix(L,Zeta_x,Zeta_y,Zeta_z,[],[],[],[],[],[]);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	447 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	448
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	449 switch BM.boundpos
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	450 case {'l'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	451 tau = sparse(obj.n*side,pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	452 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	453 Vi_minus = Vi(pos+zeroval+1:obj.n*side,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	454 V_plus = V(:,1:pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	455 V_minus = V(:,(pos+zeroval)+1:obj.n*side);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	456
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	457 tau(1:pos,:) = -abs(D(1:pos,1:pos));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	458 R = -inv(LV_plus)(L*V_minus);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	459 closure = Hie_Vtau(Vi_plus-RVi_minus)e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	460 penalty = -Hie_Vtauinv(LV_plus)L;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	461 case {'r'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	462 tau = sparse(obj.n*side,neg);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	463 tau((pos+zeroval)+1:obj.nside,:) = -abs(D((pos+zeroval)+1:obj.nside,(pos+zeroval)+1:obj.n*side));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	464 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	465 Vi_minus = Vi((pos+zeroval)+1:obj.n*side,:);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	466
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	467 V_plus = V(:,1:pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	468 V_minus = V(:,(pos+zeroval)+1:obj.n*side);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	469 R = -inv(LV_minus)(L*V_plus);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	470 closure = Hie_Vtau(Vi_minus-RVi_plus)e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	471 penalty = -Hie_Vtauinv(LV_minus)L;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	472 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	473 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	474
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	475
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	476 function [V,Vi, D,signVec] = matrixDiag(obj,mat,x,y,z,x_1,x_2,y_1,y_2,z_1,z_2)
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	477 params = obj.params;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	478 eps = 10^(-10);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	479 if(sum(abs(x_1))>eps)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	480 syms x_1s
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	481 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	482 x_1s = 0;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	483 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	484
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	485 if(sum(abs(x_2))>eps)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	486 syms x_2s;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	487 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	488 x_2s = 0;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	489 end
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	490
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	491
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	492 if(sum(abs(y_1))>eps)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	493 syms y_1s
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	494 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	495 y_1s = 0;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	496 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	497
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	498 if(sum(abs(y_2))>eps)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	499 syms y_2s;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	500 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	501 y_2s = 0;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	502 end
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	503
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	504 if(sum(abs(z_1))>eps)
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	505 syms z_1s
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	506 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	507 z_1s = 0;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	508 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	509
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	510 if(sum(abs(z_2))>eps)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	511 syms z_2s;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	512 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	513 z_2s = 0;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	514 end
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	515
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	516 syms xs ys zs
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	517 [V, D] = eig(mat(obj,xs,ys,zs,x_1s,x_2s,y_1s,y_2s,z_1s,z_2s));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	518 Vi = inv(V);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	519 % syms x_1s x_2s y_1s y_2s z_1s z_2s
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	520 xs = x;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	521 ys = y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	522 zs = z;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	523 x_1s = x_1;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	524 x_2s = x_2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	525 y_1s = y_1;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	526 y_2s = y_2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	527 z_1s = z_1;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	528 z_2s = z_2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	529
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	530 side = max(length(x),length(y));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	531 Dret = zeros(obj.n,side*obj.n);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	532 Vret = zeros(obj.n,side*obj.n);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	533 Viret = zeros(obj.n,side*obj.n);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	534
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	535 for ii=1:obj.n
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	536 for jj=1:obj.n
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	537 Dret(jj,(ii-1)side+1:sideii) = eval(D(jj,ii));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	538 Vret(jj,(ii-1)side+1:sideii) = eval(V(jj,ii));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	539 Viret(jj,(ii-1)side+1:sideii) = eval(Vi(jj,ii));
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	540 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	541 end
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	542
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	543 D = sparse(Dret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	544 V = sparse(Vret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	545 Vi = sparse(Viret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	546 V = obj.evaluateCoefficientMatrix(V,x,y,z,x_1,x_2,y_1,y_2,z_1,z_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	547 D = obj.evaluateCoefficientMatrix(D,x,y,z,x_1,x_2,y_1,y_2,z_1,z_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	548 Vi = obj.evaluateCoefficientMatrix(Vi,x,y,z,x_1,x_2,y_1,y_2,z_1,z_2);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	549 DD = diag(D);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	550
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	551 poseig = (DD>0);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	552 zeroeig = (DD==0);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	553 negeig = (DD<0);
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	554
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	555 D = diag([DD(poseig); DD(zeroeig); DD(negeig)]);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	556 V = [V(:,poseig) V(:,zeroeig) V(:,negeig)];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	557 Vi = [Vi(poseig,:); Vi(zeroeig,:); Vi(negeig,:)];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	558 signVec = [sum(poseig),sum(zeroeig),sum(negeig)];
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	559 end
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	560 end
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 351 diff changeset	561 end

Mercurial > repos > public > sbplib

annotate +scheme/Hypsyst3dCurve.m @ 368:53abf04f5e4e feature/hypsyst