sbplib: +scheme/Hypsyst3d.m annotate

annotate +scheme/Hypsyst3d.m @ 1226:0652b34f9f27 feature/volcano

Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders.

author	Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date	Tue, 12 Nov 2019 09:00:48 -0800
parents	706d1c2b4199
children	ef08adea56c4

rev	line source
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	1 classdef Hypsyst3d < scheme.Scheme
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	2 properties
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	3 m % Number of points in each direction, possibly a vector
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	4 n % Size of system
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	5 h % Grid spacing
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	6 grid %TODO: Abstract class requires a grid. Pass Cartesian grid to function instead
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	7 x, y, z % Grid
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	8 X, Y, Z% Values of x and y for each grid point
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	9 Yx, Zx, Xy, Zy, Xz, Yz %Grid values for boundary surfaces
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	10 order % Order accuracy for the approximation
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	11
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	12 D % non-stabilized scheme operator
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	13 A, B, C, E % Symbolic coefficient matrices
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	14 Aevaluated,Bevaluated,Cevaluated, Eevaluated
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	15
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	16 H % Discrete norm
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	17 Hx, Hy, Hz % Norms in the x, y and z directions
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	18 Hxi,Hyi, Hzi % Kroneckerd norms. 1'Hxv corresponds to integration in the x dir.
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	19 I_x,I_y, I_z, I_N
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	20 e_w, e_e, e_s, e_n, e_b, e_t
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	21 params % Parameters for the coefficient matrices
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	22 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	23
459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	24
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	25 methods
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	26 % Solving Hyperbolic systems on the form u_t=-Au_x-Bu_y-Cu_z-Eu
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	27 function obj = Hypsyst3d(m, lim, order, A, B, C, E, params, operator)
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	28 default_arg('E', [])
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	29 xlim = lim{1};
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	30 ylim = lim{2};
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	31 zlim = lim{3};
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	32
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	33 if length(m) == 1
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	34 m = [m m m];
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	35 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	36
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	37 obj.A = A;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	38 obj.B = B;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	39 obj.C = C;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	40 obj.E = E;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	41 m_x = m(1);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	42 m_y = m(2);
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	43 m_z = m(3);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	44 obj.params = params;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	45
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	46 switch operator
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	47 case 'upwind'
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	48 ops_x = sbp.D1Upwind(m_x,xlim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	49 ops_y = sbp.D1Upwind(m_y,ylim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	50 ops_z = sbp.D1Upwind(m_z,zlim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	51 otherwise
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	52 ops_x = sbp.D2Standard(m_x,xlim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	53 ops_y = sbp.D2Standard(m_y,ylim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	54 ops_z = sbp.D2Standard(m_z,zlim,order);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	55 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	56
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	57 obj.x = ops_x.x;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	58 obj.y = ops_y.x;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	59 obj.z = ops_z.x;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	60
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	61 obj.X = kr(obj.x,ones(m_y,1),ones(m_z,1));
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	62 obj.Y = kr(ones(m_x,1),obj.y,ones(m_z,1));
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	63 obj.Z = kr(ones(m_x,1),ones(m_y,1),obj.z);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	64
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	65 obj.Yx = kr(obj.y,ones(m_z,1));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	66 obj.Zx = kr(ones(m_y,1),obj.z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	67 obj.Xy = kr(obj.x,ones(m_z,1));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	68 obj.Zy = kr(ones(m_x,1),obj.z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	69 obj.Xz = kr(obj.x,ones(m_y,1));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	70 obj.Yz = kr(ones(m_z,1),obj.y);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	71
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	72 obj.Aevaluated = obj.evaluateCoefficientMatrix(A, obj.X, obj.Y,obj.Z);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	73 obj.Bevaluated = obj.evaluateCoefficientMatrix(B, obj.X, obj.Y,obj.Z);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	74 obj.Cevaluated = obj.evaluateCoefficientMatrix(C, obj.X, obj.Y,obj.Z);
5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	75 obj.Eevaluated = obj.evaluateCoefficientMatrix(E, obj.X, obj.Y,obj.Z);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	76
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	77 obj.n = length(A(obj.params,0,0,0));
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	78
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	79 I_n = speye(obj.n);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	80 I_x = speye(m_x);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	81 obj.I_x = I_x;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	82 I_y = speye(m_y);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	83 obj.I_y = I_y;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	84 I_z = speye(m_z);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	85 obj.I_z = I_z;
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	86 I_N = kr(I_n,I_x,I_y,I_z);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	87
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	88 obj.Hxi = kr(I_n, ops_x.HI, I_y,I_z);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	89 obj.Hx = ops_x.H;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	90 obj.Hyi = kr(I_n, I_x, ops_y.HI,I_z);
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	91 obj.Hy = ops_y.H;
350 5d5652fe826a A commit before I try resolving the performance issues Ylva Rydin <ylva.rydin@telia.com> parents: 349 diff changeset	92 obj.Hzi = kr(I_n, I_x,I_y, ops_z.HI);
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	93 obj.Hz = ops_z.H;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	94
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	95 obj.e_w = kr(I_n, ops_x.e_l, I_y,I_z);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	96 obj.e_e = kr(I_n, ops_x.e_r, I_y,I_z);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	97 obj.e_s = kr(I_n, I_x, ops_y.e_l,I_z);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	98 obj.e_n = kr(I_n, I_x, ops_y.e_r,I_z);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	99 obj.e_b = kr(I_n, I_x, I_y, ops_z.e_l);
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	100 obj.e_t = kr(I_n, I_x, I_y, ops_z.e_r);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	101
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	102 obj.m = m;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	103 obj.h = [ops_x.h ops_y.h ops_x.h];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	104 obj.order = order;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	105
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	106 switch operator
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	107 case 'upwind'
368 53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 356 diff changeset	108 alphaA = max(abs(eig(A(params,obj.x(end),obj.y(end),obj.z(end)))));
53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 356 diff changeset	109 alphaB = max(abs(eig(B(params,obj.x(end),obj.y(end),obj.z(end)))));
53abf04f5e4e Made some small changes. Ylva Rydin <ylva.rydin@telia.com> parents: 356 diff changeset	110 alphaC = max(abs(eig(C(params,obj.x(end),obj.y(end),obj.z(end)))));
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	111
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	112 Ap = (obj.Aevaluated+alphaA*I_N)/2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	113 Am = (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	114 Dpx = kr(I_n, ops_x.Dp, I_y,I_z);
69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	115 Dmx = kr(I_n, ops_x.Dm, I_y,I_z);
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	116 obj.D = -Am*Dpx;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	117 temp = Ap*Dmx;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	118 obj.D = obj.D-temp;
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	119 clear Ap Am Dpx Dmx
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	120
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	121 Bp = (obj.Bevaluated+alphaB*I_N)/2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	122 Bm = (obj.Bevaluated-alphaB*I_N)/2;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	123 Dpy = kr(I_n, I_x, ops_y.Dp,I_z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	124 Dmy = kr(I_n, I_x, ops_y.Dm,I_z);
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	125 temp = Bm*Dpy;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	126 obj.D = obj.D-temp;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	127 temp = Bp*Dmy;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	128 obj.D = obj.D-temp;
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	129 clear Bp Bm Dpy Dmy
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	130
459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	131
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	132 Cp = (obj.Cevaluated+alphaC*I_N)/2;
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	133 Cm = (obj.Cevaluated-alphaC*I_N)/2;
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	134 Dpz = kr(I_n, I_x, I_y,ops_z.Dp);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	135 Dmz = kr(I_n, I_x, I_y,ops_z.Dm);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	136
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	137 temp = Cm*Dpz;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	138 obj.D = obj.D-temp;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	139 temp = Cp*Dmz;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	140 obj.D = obj.D-temp;
355 69b078cf8072 Upwind doed not work in the non curve-linear case. Ylva Rydin <ylva.rydin@telia.com> parents: 354 diff changeset	141 clear Cp Cm Dpz Dmz
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	142 obj.D = obj.D-obj.Eevaluated;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	143
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	144 case 'standard'
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	145 D1_x = kr(I_n, ops_x.D1, I_y,I_z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	146 D1_y = kr(I_n, I_x, ops_y.D1,I_z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	147 D1_z = kr(I_n, I_x, I_y,ops_z.D1);
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	148 obj.D = -obj.AevaluatedD1_x-obj.BevaluatedD1_y-obj.Cevaluated*D1_z-obj.Eevaluated;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	149 otherwise
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	150 error('Opperator not supported');
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	151 end
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	152 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	153
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	154 % Closure functions return the operators applied to the own domain to close the boundary
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	155 % Penalty functions return the operators to force the solution. In the case of an interface it returns the operator applied to the other doamin.
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	156 % boundary is a string specifying the boundary e.g. 'l','r' or 'e','w','n','s'.
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	157 % type is a string specifying the type of boundary condition if there are several.
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	158 % data is a function returning the data that should be applied at the boundary.
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	159 function [closure, penalty] = boundary_condition(obj,boundary,type,L)
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	160 default_arg('type','char');
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	161 BM = boundary_matrices(obj,boundary);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	162 switch type
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	163 case{'c','char'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	164 [closure,penalty] = boundary_condition_char(obj,BM);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	165 case{'general'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	166 [closure,penalty] = boundary_condition_general(obj,BM,boundary,L);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	167 otherwise
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	168 error('No such boundary condition')
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	169 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	170 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	171
946 706d1c2b4199 Raname opts to type in a bunch of interface methods Jonatan Werpers <jonatan@werpers.com> parents: 910 diff changeset	172 function [closure, penalty] = interface(obj, boundary, neighbour_scheme, neighbour_boundary, type)
706d1c2b4199 Raname opts to type in a bunch of interface methods Jonatan Werpers <jonatan@werpers.com> parents: 910 diff changeset	173 error('Not implemented');
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	174 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	175
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	176 % TODO: Implement! This function should potentially replace boundary_matrices.
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	177 % Returns the boundary operator op for the boundary specified by the string boundary.
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	178 % op -- string or a cell array of strings
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	179 % boundary -- string
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	180 function varargout = getBoundaryOperator(obj, op, boundary)
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	181 error('Not implemented');
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	182 end
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	183
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	184 % TODO: Implement!
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	185 % Returns square boundary quadrature matrix, of dimension
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	186 % corresponding to the number of boundary points
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	187 %
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	188 % boundary -- string
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	189 function H = getBoundaryQuadrature(obj, boundary)
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	190 error('Not implemented');
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	191 end
0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	192
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	193 function N = size(obj)
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	194 N = obj.m;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	195 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	196
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	197 function [ret] = evaluateCoefficientMatrix(obj, mat, X, Y, Z)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	198 params = obj.params;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	199 side = max(length(X),length(Y));
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	200 if isa(mat,'function_handle')
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	201 [rows,cols] = size(mat(params,0,0,0));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	202 matVec = mat(params,X',Y',Z');
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	203 matVec = sparse(matVec);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	204 else
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	205 matVec = mat;
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	206 [rows,cols] = size(matVec);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	207 side = max(length(X),length(Y));
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	208 cols = cols/side;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	209 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	210
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	211 ret = cell(rows,cols);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	212 for ii = 1:rows
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	213 for jj = 1:cols
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	214 ret{ii,jj} = diag(matVec(ii,(jj-1)side+1:jjside));
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	215 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	216 end
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	217 ret = cell2mat(ret);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	218 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	219
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	220 function [BM] = boundary_matrices(obj,boundary)
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	221 params = obj.params;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	222
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	223 switch boundary
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	224 case {'w','W','west'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	225 BM.e_ = obj.e_w;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	226 mat = obj.A;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	227 BM.boundpos = 'l';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	228 BM.Hi = obj.Hxi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	229 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.X(1),obj.Yx,obj.Zx);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	230 BM.side = length(obj.Yx);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	231 case {'e','E','east'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	232 BM.e_ = obj.e_e;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	233 mat = obj.A;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	234 BM.boundpos = 'r';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	235 BM.Hi = obj.Hxi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	236 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.X(end),obj.Yx,obj.Zx);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	237 BM.side = length(obj.Yx);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	238 case {'s','S','south'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	239 BM.e_ = obj.e_s;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	240 mat = obj.B;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	241 BM.boundpos = 'l';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	242 BM.Hi = obj.Hyi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	243 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.Xy,obj.Y(1),obj.Zy);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	244 BM.side = length(obj.Xy);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	245 case {'n','N','north'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	246 BM.e_ = obj.e_n;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	247 mat = obj.B;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	248 BM.boundpos = 'r';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	249 BM.Hi = obj.Hyi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	250 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.Xy,obj.Y(end),obj.Zy);
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	251 BM.side = length(obj.Xy);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	252 case{'b','B','Bottom'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	253 BM.e_ = obj.e_b;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	254 mat = obj.C;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	255 BM.boundpos = 'l';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	256 BM.Hi = obj.Hzi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	257 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.Xz,obj.Yz,obj.Z(1));
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	258 BM.side = length(obj.Xz);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	259 case{'t','T','Top'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	260 BM.e_ = obj.e_t;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	261 mat = obj.C;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	262 BM.boundpos = 'r';
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	263 BM.Hi = obj.Hzi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	264 [BM.V,BM.Vi,BM.D,signVec] = obj.matrixDiag(mat,obj.Xz,obj.Yz,obj.Z(end));
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	265 BM.side = length(obj.Xz);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	266 end
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	267 BM.pos = signVec(1); BM.zeroval=signVec(2); BM.neg=signVec(3);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	268 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	269
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	270 % Characteristic boundary conditions
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	271 function [closure, penalty]=boundary_condition_char(obj,BM)
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	272 side = BM.side;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	273 pos = BM.pos;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	274 neg = BM.neg;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	275 zeroval=BM.zeroval;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	276 V = BM.V;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	277 Vi = BM.Vi;
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	278 Hi = BM.Hi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	279 D = BM.D;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	280 e_ = BM.e_;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	281
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	282 switch BM.boundpos
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	283 case {'l'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	284 tau = sparse(obj.n*side,pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	285 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	286 tau(1:pos,:) = -abs(D(1:pos,1:pos));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	287 closure = Hie_VtauVi_plus*e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	288 penalty = -Hie_VtauVi_plus;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	289 case {'r'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	290 tau = sparse(obj.n*side,neg);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	291 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: 352 diff changeset	292 Vi_minus = Vi((pos+zeroval)+1:obj.n*side,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	293 closure = Hie_VtauVi_minus*e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	294 penalty = -Hie_VtauVi_minus;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	295 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	296 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	297
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	298 % General boundary condition in the form Lu=g(x)
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	299 function [closure,penalty] = boundary_condition_general(obj,BM,boundary,L)
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	300 side = BM.side;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	301 pos = BM.pos;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	302 neg = BM.neg;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	303 zeroval=BM.zeroval;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	304 V = BM.V;
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	305 Vi = BM.Vi;
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	306 Hi = BM.Hi;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	307 D = BM.D;
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	308 e_ = BM.e_;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	309
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	310 switch boundary
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	311 case {'w','W','west'}
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	312 L = obj.evaluateCoefficientMatrix(L,obj.x(1),obj.Yx,obj.Zx);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	313 case {'e','E','east'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	314 L = obj.evaluateCoefficientMatrix(L,obj.x(end),obj.Yx,obj.Zx);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	315 case {'s','S','south'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	316 L = obj.evaluateCoefficientMatrix(L,obj.Xy,obj.y(1),obj.Zy);
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	317 case {'n','N','north'}
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	318 L = obj.evaluateCoefficientMatrix(L,obj.Xy,obj.y(end),obj.Zy);% General boundary condition in the form Lu=g(x)
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	319 case {'b','B','bottom'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	320 L = obj.evaluateCoefficientMatrix(L,obj.Xz,obj.Yz,obj.z(1));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	321 case {'t','T','top'}
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	322 L = obj.evaluateCoefficientMatrix(L,obj.Xz,obj.Yz,obj.z(end));
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	323 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	324
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	325 switch BM.boundpos
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	326 case {'l'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	327 tau = sparse(obj.n*side,pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	328 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	329 Vi_minus = Vi(pos+zeroval+1:obj.n*side,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	330 V_plus = V(:,1:pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	331 V_minus = V(:,(pos+zeroval)+1:obj.n*side);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	332
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	333 tau(1:pos,:) = -abs(D(1:pos,1:pos));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	334 R = -inv(LV_plus)(L*V_minus);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	335 closure = Hie_Vtau(Vi_plus-RVi_minus)e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	336 penalty = -Hie_Vtauinv(LV_plus)L;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	337 case {'r'}
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	338 tau = sparse(obj.n*side,neg);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	339 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: 352 diff changeset	340 Vi_plus = Vi(1:pos,:);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	341 Vi_minus = Vi((pos+zeroval)+1:obj.n*side,:);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	342
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	343 V_plus = V(:,1:pos);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	344 V_minus = V(:,(pos+zeroval)+1:obj.n*side);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	345 R = -inv(LV_minus)(L*V_plus);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	346 closure = Hie_Vtau(Vi_minus-RVi_plus)e_';
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	347 penalty = -Hie_Vtauinv(LV_minus)L;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	348 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	349 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	350
369 9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	351 % Function that diagonalizes a symbolic matrix A as A=VDVi
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	352 % D is a diagonal matrix with the eigenvalues on A on the diagonal sorted by their sign
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	353 % [d+ ]
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	354 % D = [ d0 ]
9d1fc984f40d Added some comments and cleaned up the code a little Ylva Rydin <ylva.rydin@telia.com> parents: 368 diff changeset	355 % [ d-]
1226 0652b34f9f27 Add missing properties and methods to Hypsyst3D and Hypsyst3Dcurve. Note: These functions are NOT implemented properly and mearly work as place holders. Vidar Stiernström <vidar.stiernstrom@it.uu.se> parents: 946 diff changeset	356 % signVec is a vector specifying the number of positive, zero and negative eigenvalues of D
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	357 function [V,Vi, D,signVec]=matrixDiag(obj,mat,x,y,z)
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	358 params = obj.params;
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	359 syms xs ys zs
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	360 [V, D] = eig(mat(params,xs,ys,zs));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	361 Vi=inv(V);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	362 xs = x;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	363 ys = y;
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	364 zs = z;
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	365
459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	366
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	367 side = max(length(x),length(y));
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	368 Dret = zeros(obj.n,side*obj.n);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	369 Vret = zeros(obj.n,side*obj.n);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	370 Viret= zeros(obj.n,side*obj.n);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	371
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	372 for ii=1:obj.n
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	373 for jj=1:obj.n
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	374 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: 352 diff changeset	375 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: 352 diff changeset	376 Viret(jj,(ii-1)side+1:sideii) = eval(Vi(jj,ii));
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	377 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	378 end
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	379
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	380 D = sparse(Dret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	381 V = sparse(Vret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	382 Vi = sparse(Viret);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	383 V = obj.evaluateCoefficientMatrix(V,x,y,z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	384 Vi= obj.evaluateCoefficientMatrix(Vi,x,y,z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	385 D = obj.evaluateCoefficientMatrix(D,x,y,z);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	386 DD = diag(D);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	387
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	388 poseig = (DD>0);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	389 zeroeig = (DD==0);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	390 negeig = (DD<0);
905 459eeb99130f Include type as (optional) input parameter in the interface method of all schemes. Martin Almquist <malmquist@stanford.edu> parents: 372 diff changeset	391
354 dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	392 D = diag([DD(poseig); DD(zeroeig); DD(negeig)]);
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	393 V = [V(:,poseig) V(:,zeroeig) V(:,negeig)];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	394 Vi= [Vi(poseig,:); Vi(zeroeig,:); Vi(negeig,:)];
dbac99d2c318 Removed inv(Vi) to save time Ylva Rydin <ylva.rydin@telia.com> parents: 352 diff changeset	395 signVec = [sum(poseig),sum(zeroeig),sum(negeig)];
349 cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	396 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	397 end
cd6a29ab3746 A 3D is added and an attempt to imlement 3D transfinit interpolation has been initialized Ylva Rydin <ylva.rydin@telia.com> parents: diff changeset	398 end

Mercurial > repos > public > sbplib

annotate +scheme/Hypsyst3d.m @ 1226:0652b34f9f27 feature/volcano