Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-codegen
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Christian Heinigk
dune-codegen
Commits
33bc88f6
Commit
33bc88f6
authored
8 years ago
by
Dominic Kempf
Browse files
Options
Downloads
Patches
Plain Diff
Use gitlab remote and remove patch for UFL
parent
c4a51591
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitmodules
+1
-2
1 addition, 2 deletions
.gitmodules
patches/ufl/0001-Give-conditional-an-ufl_id.patch
+0
-26
0 additions, 26 deletions
patches/ufl/0001-Give-conditional-an-ufl_id.patch
python/ufl
+1
-1
1 addition, 1 deletion
python/ufl
with
2 additions
and
29 deletions
.gitmodules
+
1
−
2
View file @
33bc88f6
...
@@ -3,8 +3,7 @@
...
@@ -3,8 +3,7 @@
url = https://gitlab.tiker.net/inducer/loopy.git
url = https://gitlab.tiker.net/inducer/loopy.git
[submodule "python/ufl"]
[submodule "python/ufl"]
path = python/ufl
path = python/ufl
url = https://bitbucket.org/dokempf/ufl.git
url = https://parcomp-git.iwr.uni-heidelberg.de/dominic/ufl.git
ignore = untracked
[submodule "python/pymbolic"]
[submodule "python/pymbolic"]
path = python/pymbolic
path = python/pymbolic
url = https://github.com/inducer/pymbolic.git
url = https://github.com/inducer/pymbolic.git
...
...
This diff is collapsed.
Click to expand it.
patches/ufl/0001-Give-conditional-an-ufl_id.patch
deleted
100644 → 0
+
0
−
26
View file @
c4a51591
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
This diff is collapsed.
Click to expand it.
ufl
@
158cd8d8
Subproject commit
e64c3fae7654848f4dc77754b74311758e7fb351
Subproject commit
158cd8d8c477792da2fa8c63eabcf403370caabf
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment