From 2f7d8aa895bfeee5fb2ac4df4f2cc52ca329add8 Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Mon, 20 May 2013 13:20:27 -0400
Subject: [PATCH] fix examples/square
---
examples/square.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/examples/square.py b/examples/square.py
index 19224461..e3528e80 100644
--- a/examples/square.py
+++ b/examples/square.py
@@ -6,7 +6,7 @@ from __future__ import division
import numpy as np
from matplotlib import pyplot
import kwant
-from kwant.physics.selfenergy import square_selfenergy
+from kwant.physics.leads import square_selfenergy
__all__ = ['System']
@@ -16,14 +16,9 @@ class Lead(object):
self.t = t
self.potential = potential
-<<<<<<< HEAD
- def self_energy(self, fermi_energy, args=()):
- return square_self_energy(self.width, self.t, self.potential,
-=======
- def selfenergy(self, fermi_energy):
- return square_selfenergy(self.width, self.t, self.potential,
->>>>>>> modes
- fermi_energy)
+ def selfenergy(self, fermi_energy, args=()):
+ return square_selfenergy(self.width, self.t,
+ self.potential + fermi_energy)
class System(kwant.system.FiniteSystem):
def __init__(self, shape, hopping,
--
GitLab