Mercurial > repos > public > sbplib

comparison +scheme/Wave2dCurve.m @ 96:19d0c9325a3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wave2dCurve: Removed some comments.
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 02 Dec 2015 16:21:16 +0100
parents 53fe4b64f65e
children f18142c1530b
comparison
equal deleted inserted replaced
95:480ef676742f 96:19d0c9325a3e
262 b2_u = gamm_u*u.lambda(I_u)./u.a22(I_u).^2; 262 b2_u = gamm_u*u.lambda(I_u)./u.a22(I_u).^2;
263 b1_v = gamm_v*v.lambda(I_v)./v.a11(I_v).^2; 263 b1_v = gamm_v*v.lambda(I_v)./v.a11(I_v).^2;
264 b2_v = gamm_v*v.lambda(I_v)./v.a22(I_v).^2; 264 b2_v = gamm_v*v.lambda(I_v)./v.a22(I_v).^2;
265 265
266 tau = -1./(4*b1_u) -1./(4*b1_v) -1./(4*b2_u) -1./(4*b2_v); 266 tau = -1./(4*b1_u) -1./(4*b1_v) -1./(4*b2_u) -1./(4*b2_v);
267 tau = tuning * spdiag(tau(:)); % Probably correct until here, see eq 27 267 tau = tuning * spdiag(tau(:));
268 sig1 = 1/2; 268 sig1 = 1/2;
269 sig2 = -1/2; 269 sig2 = -1/2;
270 270
271 % penalty_parameter_1 = halfnorm_inv_u_n*(tau + sig1*halfnorm_inv_u_t*F_u*e_u'*halfnorm_u_t)*e_u; %% This is what is in the paper, but there is an error in dimensions. 271 penalty_parameter_1 = halfnorm_inv_u_n*(e_u*tau + sig1*halfnorm_inv_u_t*F_u*e_u'*halfnorm_u_t*e_u);
272 penalty_parameter_1 = halfnorm_inv_u_n*(e_u*tau + sig1*halfnorm_inv_u_t*F_u*e_u'*halfnorm_u_t*e_u); %% Random guess at a fix, should check theory for this.
273 penalty_parameter_2 = halfnorm_inv_u_n * sig2 * e_u; 272 penalty_parameter_2 = halfnorm_inv_u_n * sig2 * e_u;
274 273
275 274
276 closure = obj.Ji*obj.c^2 * ( penalty_parameter_1*e_u' + penalty_parameter_2*F_u'); 275 closure = obj.Ji*obj.c^2 * ( penalty_parameter_1*e_u' + penalty_parameter_2*F_u');
277 penalty = obj.Ji*obj.c^2 * (-penalty_parameter_1*e_v' + penalty_parameter_2*F_v'); 276 penalty = obj.Ji*obj.c^2 * (-penalty_parameter_1*e_v' + penalty_parameter_2*F_v');