Mercurial > repos > public > sbplib

changeset 511:57f3493f851b feature/quantumTriangles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added sqrt of Ji in the right places, not sure about the interfaces, will not test it properly now
author Ylva Rydin <ylva.rydin@telia.com>
date Thu, 08 Jun 2017 10:33:36 +0200
parents 71908bbce2e1
children 4ef2d2a493f1
files +scheme/Schrodinger1dCurve.m
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
diff -r 71908bbce2e1 -r 57f3493f851b +scheme/Schrodinger1dCurve.m
--- a/+scheme/Schrodinger1dCurve.m	Fri Jun 02 17:46:01 2017 +0200
+++ b/+scheme/Schrodinger1dCurve.m	Thu Jun 08 10:33:36 2017 +0200
@@ -86,7 +86,7 @@
         
         function [D] = d_fun(obj,t)
             obj.variable_update(t); % In driscretization?
-             D = (-0.5*(obj.D1*obj.a + obj.a*obj.D1) + 1i*obj.D2(diag(obj.Ji)) + 1i*obj.V_mat);
+             D = sqrt(obj.Ji)*(-0.5*(obj.D1*obj.a + obj.a*obj.D1) + 1i*obj.D2(diag(obj.Ji)) + 1i*obj.V_mat)*sqrt(obj.Ji);
 %             D = (-0.5*(obj.D1*obj.a -obj.a_xi+ obj.a*obj.D1) + 1i*obj.D2(diag(obj.Ji)) + 1i*obj.V_mat);
           %   D= obj.Ji*(-sqrt(obj.a)*obj.D1*sqrt(obj.a) + 0.5*obj.a_xi + 1i*obj.D2(diag(obj.Ji)) + 1i*obj.V_mat);
         end
@@ -121,11 +121,11 @@
                 case {'D','d','dirichlet'}
                     tau1 = @(t) s * 1i*obj.Ji(p,p)*d;
                     tau2 = @(t) (1*s*obj.a(p,p))/2*e;
-                    closure = @(t)(obj.Hi*tau1(t)*e' + obj.Hi*tau2(obj.a)*e');
+                    closure = @(t)obj.Hi*sqrt(obj.Ji)*(tau1(t)*e' + tau2(obj.a)*e')*sqrt(obj.Ji);
                     
                     switch class(data)
                         case 'double'
-                            penalty = @(t) -(obj.Hi*tau1*data+obj.Hi*tau2(obj.a)*data);
+                            penalty = @(t) -obj.Hi*sqrt(obj.Ji)*(tau1*data+tau2(obj.a)*data)*sqrt(obj.Ji);
                             %                      case 'function_handle'
                             %                           penalty = @(t)-obj.Hi*tau*data(t);
                         otherwise
@@ -146,13 +146,13 @@
             
             a1 =   s_u* 1/2 * 1i ;
             b1 =   -s_u* 1/2 * 1i;
-            gamma = @(a) -s_u*a(p_u,p_u)/2*e_u;
+            gamma = @(a) s_u*a(p_u,p_u)/2*e_u;
             
             tau = @(t) a1*obj.Ji(p_u,p_u)^2*d_u;
             sig = b1*e_u;
             
-            closure = @(t) obj.Hi * (tau(t)*e_u' + sig*obj.Ji(p_u,p_u)^2*d_u' + gamma(obj.a)*e_u');
-            penalty = @(t) obj.Hi * (-tau(t)*e_v' - sig*obj.Ji(p_u,p_u)^2*d_v' - gamma(obj.a)*e_v');
+            closure = @(t) obj.Hi * (tau(t)*e_u' + sig*obj.Ji(p_u,p_u)^2*d_u' + obj.Ji(p_u,p_u)*gamma(obj.a)*e_u');
+            penalty = @(t) obj.Hi * (-tau(t)*e_v' - sig*obj.Ji(p_u,p_u)^2*d_v' - obj.Ji(p_u,p_u)*gamma(obj.a)*e_v');
         end
         
         % Ruturns the boundary ops and sign for the boundary specified by the string boundary.