← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffc/vivid

« back to all changes in this revision

Viewing changes to ffc/extras.py

  • Committer: Package Import Robot
  • Author(s): Johannes Ring
  • Date: 2014-06-03 18:26:02 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20140603182602-zvnubjjh7i78e1v0
Tags: 1.4.0-1
* New upstream release.
* debian/control:
  - Add swig in Build-Depends.
  - Remove python-ufc from Depends.
  - Add ufc and python-ufc to Provides, Conflicts and Replaces.
  - Remove python-ferari and python-dolfin from Suggests.
  - Bump minimum required version for python-fiat, python-instant and
    python-ufl to 1.4.0.
* debian/rules: Add override for auto clean target to remove generated
  cmake and pkg-config files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffc/extras.py
73
73
    # Extract entries in reference tensor
74
74
    reference_tensors = []
75
75
    for i in ir_integrals:
76
 
        if i["domain_type"] == "cell":
 
76
        if i["integral_type"] == "cell":
77
77
            t = [A0.A0 for (A0, GK, dummy) in i["AK"]]
78
78
            if len(t) == 1: t = t[0]
79
 
        elif i["domain_type"] == "exterior_facet":
 
79
        elif i["integral_type"] == "exterior_facet":
80
80
            t = [A0.A0 for j in i["AK"] for (A0, GK, dummy) in j]
81
81
            if len(t) == 1: t = t[0]
82
 
        elif i["domain_type"] == "interior_facet":
 
82
        elif i["integral_type"] == "interior_facet":
83
83
            t = [A0.A0 for j in i["AK"] for k in j for (A0, GK, dummy) in k]
84
84
            if len(t) == 1: t = t[0]
85
85
        else:
86
 
            raise RuntimeError, "Unhandled domain type: %s" % str(i["domain_type"])
 
86
            raise RuntimeError, "Unhandled domain type: %s" % str(i["integral_type"])
87
87
        reference_tensors.append(t)
88
88
 
89
89
    # Extract code