changeset 493:6b8297f66c91 feature/quantumTriangles

Commit before merge
author Ylva Rydin <ylva.rydin@telia.com>
date Thu, 23 Feb 2017 09:31:56 +0100
parents 6b95a894cbd7
children c6d03f951a7f
files +scheme/Schrodinger1dCurve.m +scheme/Schrodinger2dCurve.m
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/+scheme/Schrodinger1dCurve.m	Wed Feb 15 11:21:04 2017 +0100
+++ b/+scheme/Schrodinger1dCurve.m	Thu Feb 23 09:31:56 2017 +0100
@@ -107,17 +107,17 @@
         function [closure, penalty] = interface(obj,boundary,neighbour_scheme,neighbour_boundary)
             % u denotes the solution in the own domain
             % v denotes the solution in the neighbour domain
-            %             [e_u,d_u,s_u] = obj.get_boundary_ops(boundary);
-            %             [e_v,d_v,s_v] = neighbour_scheme.get_boundary_ops(neighbour_boundary);
+                         [e_u,d_u,s_u] = obj.get_boundary_ops(boundary);
+                         [e_v,d_v,s_v] = neighbour_scheme.get_boundary_ops(neighbour_boundary);
             
-            %             a =  -s_u* 1/2 * 1i ;
-            %             b =  a';
+                         a =  -s_u* 1/2 * 1i ;
+                         b =  a';
             
-            %             tau = b*d_u;
-            %             sig = -a*e_u;
+                         tau = b*d_u;
+                         sig = -a*e_u;
             
-            %             closure = obj.Hi * (tau*e_u' + sig*d_u');
-            %             penalty = obj.Hi * (-tau*e_v' - sig*d_v');
+                         closure = obj.Hi * (tau*e_u' + sig*d_u');
+                         penalty = obj.Hi * (-tau*e_v' - sig*d_v');
         end
         
         % Ruturns the boundary ops and sign for the boundary specified by the string boundary.
--- a/+scheme/Schrodinger2dCurve.m	Wed Feb 15 11:21:04 2017 +0100
+++ b/+scheme/Schrodinger2dCurve.m	Thu Feb 23 09:31:56 2017 +0100
@@ -141,9 +141,9 @@
             a12 = -1./J .* (x_u.*x_v + y_u.*y_v);
             a22 =  1./J .* (x_u.^2  + y_u.^2);
           
-            obj.a11=a11;
-            obj.a12=a12;
-            obj.a22=a22;
+            obj.a11 = a11;
+            obj.a12 = a12;
+            obj.a22 = a22;
             
             % Assemble full operators
             L_12 = spdiags(a12, 0, obj.m_tot, obj.m_tot);