From 33bc88f6d5759531bf0023148d763628049c5164 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Tue, 28 Mar 2017 15:34:33 +0200
Subject: [PATCH] Use gitlab remote and remove patch for UFL

---
 .gitmodules                                   |  3 +--
 .../ufl/0001-Give-conditional-an-ufl_id.patch | 26 -------------------
 python/ufl                                    |  2 +-
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 patches/ufl/0001-Give-conditional-an-ufl_id.patch

diff --git a/.gitmodules b/.gitmodules
index daf46b0e..4cf4ba72 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,7 @@
 	url = https://gitlab.tiker.net/inducer/loopy.git
 [submodule "python/ufl"]
 	path = python/ufl
-	url = https://bitbucket.org/dokempf/ufl.git
-    ignore = untracked
+	url = https://parcomp-git.iwr.uni-heidelberg.de/dominic/ufl.git
 [submodule "python/pymbolic"]
 	path = python/pymbolic
 	url = https://github.com/inducer/pymbolic.git
diff --git a/patches/ufl/0001-Give-conditional-an-ufl_id.patch b/patches/ufl/0001-Give-conditional-an-ufl_id.patch
deleted file mode 100644
index 70802092..00000000
--- a/patches/ufl/0001-Give-conditional-an-ufl_id.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8caa33075fba04cfc5bdcb47452a3c5ca400c0c5 Mon Sep 17 00:00:00 2001
-From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
-Date: Thu, 15 Dec 2016 23:30:03 +0100
-Subject: [PATCH] Give conditional an ufl_id
-
----
- ufl/conditional.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/ufl/conditional.py b/ufl/conditional.py
-index faffbb5..e48ee19 100644
---- a/ufl/conditional.py
-+++ b/ufl/conditional.py
-@@ -240,6 +240,9 @@ class Conditional(Operator):
-     def __repr__(self):
-         return "Conditional(%r, %r, %r)" % self.ufl_operands
- 
-+    def ufl_id(self):
-+        return 0
-+
- 
- #--- Specific functions higher level than a conditional ---
- 
--- 
-2.1.4
-
diff --git a/python/ufl b/python/ufl
index e64c3fae..158cd8d8 160000
--- a/python/ufl
+++ b/python/ufl
@@ -1 +1 @@
-Subproject commit e64c3fae7654848f4dc77754b74311758e7fb351
+Subproject commit 158cd8d8c477792da2fa8c63eabcf403370caabf
-- 
GitLab