Mercurial > repos > public > sbplib
comparison +scheme/Schrodinger2dCurve.m @ 695:ba0d31ce4121 feature/quantumTriangles
Changed jacobian at right side of the penalty term in 2D, seems like it is working
author | Ylva Rydin <ylva.rydin@telia.com> |
---|---|
date | Tue, 19 Sep 2017 09:51:08 +0200 |
parents | 1157375c678a |
children | 0122cbe2e6d3 |
comparison
equal
deleted
inserted
replaced
694:1157375c678a | 695:ba0d31ce4121 |
---|---|
249 penalty_parameter_2 = @(t) halfnorm_inv_u_n * e_u * (sig ); | 249 penalty_parameter_2 = @(t) halfnorm_inv_u_n * e_u * (sig ); |
250 penalty_parameter_3 = @(t) halfnorm_inv_u_n * e_u * (gamm(t) ); | 250 penalty_parameter_3 = @(t) halfnorm_inv_u_n * e_u * (gamm(t) ); |
251 | 251 |
252 | 252 |
253 closure =@(t) sqrt(Ji_u)*obj.c^2 * ( penalty_parameter_1(t)*e_u' + penalty_parameter_2(t)*F_u(t)' + penalty_parameter_3(t)*e_u')*sqrt(Ji_u); | 253 closure =@(t) sqrt(Ji_u)*obj.c^2 * ( penalty_parameter_1(t)*e_u' + penalty_parameter_2(t)*F_u(t)' + penalty_parameter_3(t)*e_u')*sqrt(Ji_u); |
254 penalty =@(t) sqrt(Ji_v)*obj.c^2 * ( -penalty_parameter_1(t)*e_v' - penalty_parameter_2(t)*F_v(t)' - penalty_parameter_3(t)*e_v')*sqrt(Ji_v); | 254 penalty =@(t) sqrt(Ji_u)*obj.c^2 * ( -penalty_parameter_1(t)*e_v' - penalty_parameter_2(t)*F_v(t)' - penalty_parameter_3(t)*e_v')*sqrt(Ji_v); |
255 end | 255 end |
256 | 256 |
257 | 257 |
258 function [e, d_n, d_t, coeff_t,coeff_n, s, halfnorm_inv_n, halfnorm_inv_t, halfnorm_t,g] = get_boundary_ops(obj, boundary) | 258 function [e, d_n, d_t, coeff_t,coeff_n, s, halfnorm_inv_n, halfnorm_inv_t, halfnorm_t,g,Ji] = get_boundary_ops(obj, boundary) |
259 | 259 |
260 % gridMatrix = zeros(obj.m(2),obj.m(1)); | 260 % gridMatrix = zeros(obj.m(2),obj.m(1)); |
261 % gridMatrix(:) = 1:numel(gridMatrix); | 261 % gridMatrix(:) = 1:numel(gridMatrix); |
262 | 262 |
263 ind = grid.funcToMatrix(obj.grid, 1:prod(obj.m)); | 263 ind = grid.funcToMatrix(obj.grid, 1:prod(obj.m)); |