Mercurial > repos > public > sbplib

changeset 500:83734c26b8e3 feature/quantumTriangles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small changes
author Ylva Rydin <ylva.rydin@telia.com>
date Thu, 20 Apr 2017 07:55:09 +0200
parents f1465e6aeb26
children b7280c6c6b9a
files +scheme/Schrodinger2dCurve.m
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/Schrodinger2dCurve.m	Mon Mar 06 17:23:52 2017 +0100
+++ b/+scheme/Schrodinger2dCurve.m	Thu Apr 20 07:55:09 2017 +0200
@@ -149,10 +149,14 @@
                 y_u = obj.Du*y;
                 y_v = obj.Dv*y;
                 
-                J = x_u.*y_v - x_v.*y_u;
-                a11 =  1./J.* (x_v.^2  + y_v.^2);
-                a12 = -1./J .* (x_u.*x_v + y_u.*y_v);
-                a22 =  1./J .* (x_u.^2  + y_u.^2);
+                J = (x_u.*y_v - x_v.*y_u);
+                
+                Ji = spdiags(1./J, 0, obj.m_tot, obj.m_tot);
+                obj.Ji = Ji;
+                
+                a11 =  Ji* (x_v.^2  + y_v.^2);
+                a12 = -Ji* (x_u.*x_v + y_u.*y_v);
+                a22 =  Ji* (x_u.^2  + y_u.^2);
                 
                 obj.a11 = a11;
                 obj.a12 = a12;
@@ -176,8 +180,6 @@
                     obj.DVV(p,p) = D;
                 end
                 
-                Ji = spdiags(1./J, 0, obj.m_tot, obj.m_tot);
-                obj.Ji = Ji;
                 obj.g_1 = x_v.*y_tau-x_tau.*y_v;
                 obj.g_2 = x_tau.*y_u - y_tau.*x_u;
                 
@@ -212,7 +214,7 @@
                     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';
+                    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';
                 
         end