Mercurial > repos > public > sbplib

changeset 515:ba92b27da5a0 feature/quantumTriangles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tried to make skewsym. Values left on the diagonal when time-dep!
author Ylva Rydin <ylva.rydin@telia.com>
date Fri, 07 Jul 2017 14:22:02 +0200
parents 32a24485f3e8
children afff85574ddb
files +scheme/Schrodinger2dCurve.m
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/Schrodinger2dCurve.m	Fri Jul 07 13:33:05 2017 +0200
+++ b/+scheme/Schrodinger2dCurve.m	Fri Jul 07 14:22:02 2017 +0200
@@ -120,8 +120,12 @@
         
         function [D] = d_fun(obj,t)
             %         obj.update_vairables(t); In driscretization?
-            D = obj.Ji*(-1/2*(obj.b1*obj.Du-obj.b1_u+obj.Du*obj.b1) - 1/2*(obj.b2*obj.Dv - obj.b2_v +obj.Dv*obj.b2) + 1i*obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV));
+            %  D = obj.Ji*(-1/2*(obj.b1*obj.Du-obj.b1_u+obj.Du*obj.b1) -
+            %  1/2*(obj.b2*obj.Dv - obj.b2_v +obj.Dv*obj.b2) +
+            %  1i*obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV)); (ols
+            %  not skew sym disc
             
+            D = sqrt(obj.Ji)*(-1/2*(obj.b1*obj.Du + obj.Du*obj.b1) - 1/2*(obj.b2*obj.Dv + obj.Dv*obj.b2) + 1i*obj.c^2*(obj.DUU + obj.DUV + obj.DVU + obj.DVV))*sqrt(obj.Ji); 
         end
         
         
@@ -214,8 +218,8 @@
                     penalty_parameter_1 = @(t) 1*1i*halfnorm_inv_n*halfnorm_inv_t*F(t)*e'*halfnorm_t*e;
                     penalty_parameter_2 = @(t) halfnorm_inv_n*e*tau2(t);
 
-                    closure = @(t) (obj.Ji*obj.c^2 * penalty_parameter_1(t)*e' + obj.Ji* penalty_parameter_2(t)*e');
-                    penalty = @(t) -obj.Ji*obj.c^2 * penalty_parameter_1(t)*e'-  obj.Ji*penalty_parameter_2(t)*e';
+                    closure = @(t)  sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e' +  penalty_parameter_2(t)*e')*sqrt(obj.Ji);
+                    penalty = @(t) -sqrt(obj.Ji)*(obj.c^2 * penalty_parameter_1(t)*e' -  penalty_parameter_2(t)*e')*sqrt(obj.Ji);
                 
         end
         
@@ -245,8 +249,8 @@
             penalty_parameter_3 = @(t) halfnorm_inv_u_n * e_u  * (gamm(t) );
 
 
-            closure =@(t) obj.Ji*obj.c^2 * ( penalty_parameter_1(t)*e_u' + penalty_parameter_2(t)*F_u(t)' + penalty_parameter_3(t)*e_u');
-            penalty =@(t) obj.Ji*obj.c^2 * ( -penalty_parameter_1(t)*e_v' - penalty_parameter_2(t)*F_v(t)' - penalty_parameter_3(t)*e_v');
+            closure =@(t) sqrt(obj.Ji)*obj.c^2 * ( penalty_parameter_1(t)*e_u' + penalty_parameter_2(t)*F_u(t)' + penalty_parameter_3(t)*e_u')*sqrt(obj.Ji);
+            penalty =@(t) sqrt(obj.Ji)*obj.c^2 * ( -penalty_parameter_1(t)*e_v' - penalty_parameter_2(t)*F_v(t)' - penalty_parameter_3(t)*e_v')*sqrt(obj.Ji);
         end