Skip to content

Commit

Permalink
Use "DOLFINx" and "FFCx" consistently (#339)
Browse files Browse the repository at this point in the history
  • Loading branch information
mscroggs authored May 4, 2021
1 parent a5f44f6 commit 52389a2
Show file tree
Hide file tree
Showing 79 changed files with 319 additions and 319 deletions.
6 changes: 3 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
To install FFCX, type
To install FFCx, type

pip install --prefix=/path/to/install/ .

This will install FFCX in the default Python path of your system,
This will install FFCx in the default Python path of your system,
something like /path/to/install/lib/python3.6/site-packages/.

To specify C++ compiler and/or compiler flags used for compiling UFC
Expand All @@ -13,6 +13,6 @@ The installation script requires the Python module distutils, which
for Debian users is available with the python-dev package. Other
dependencies are listed in the file README.

For detailed installation instructions, see the FFCX user manual which
For detailed installation instructions, see the FFCx user manual which
is available on http://fenicsproject.org/ and also in the subdirectory
doc/manual/ of this source tree.
8 changes: 4 additions & 4 deletions demo/AdaptivePoisson.ufl
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Copyright (C) 2010 Marie E. Rognes
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.

element = FiniteElement("Lagrange", triangle, 1)
element2 = FiniteElement("Lagrange", triangle, 3)
Expand Down
10 changes: 5 additions & 5 deletions demo/AlgebraOperators.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2010 Kristian B. Oelgaard
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# Test all algebra operators on Coefficients.
#
# Compile this form with FFC: ffcx AlgebraOperators.ufl
# Compile this form with FFCx: ffcx AlgebraOperators.ufl

element = FiniteElement("Lagrange", triangle, 1)

Expand Down
10 changes: 5 additions & 5 deletions demo/Biharmonic.ufl
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Copyright (C) 2009 Kristian B. Oelgaard, Garth N. Wells and Anders Logg
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# First added: 2009-06-26
# Last changed: 2011-03-08
Expand All @@ -22,7 +22,7 @@
# Biharmonic equation in a discontinuous Galerkin (DG)
# formulation.
#
# Compile this form with FFC: ffcx Biharmonic.ufl
# Compile this form with FFCx: ffcx Biharmonic.ufl

# Elements
element = FiniteElement("Lagrange", triangle, 2)
Expand Down
10 changes: 5 additions & 5 deletions demo/BiharmonicHHJ.ufl
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Copyright (C) 2016 Lizao Li
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# The bilinear form a(u, v) and linear form L(v) for
# Biharmonic equation in Hellan-Herrmann-Johnson (HHJ)
# formulation.
#
# Compile this form with FFC: ffcx BiharmonicHHJ.ufl
# Compile this form with FFCx: ffcx BiharmonicHHJ.ufl

HHJ = FiniteElement('HHJ', triangle, 2)
CG = FiniteElement('CG', triangle, 3)
Expand Down
10 changes: 5 additions & 5 deletions demo/BiharmonicRegge.ufl
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Copyright (C) 2016 Lizao Li
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# The bilinear form a(u, v) and linear form L(v) for
# Biharmonic equation in Regge formulation.
#
# Compile this form with FFC: ffcx BiharmonicRegge.ufl
# Compile this form with FFCx: ffcx BiharmonicRegge.ufl

REG = FiniteElement('Regge', tetrahedron, 1)
CG = FiniteElement('Lagrange', tetrahedron, 2)
Expand Down
10 changes: 5 additions & 5 deletions demo/CellGeometry.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2013 Martin S. Alnaes
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# A functional M involving a bunch of cell geometry quantities in ufl.
#
# Compile this form with FFC: ffcx CellGeometry.ufl
# Compile this form with FFCx: ffcx CellGeometry.ufl

cell = tetrahedron

Expand Down
10 changes: 5 additions & 5 deletions demo/CoefficientOperators.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2007 Anders Logg
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# Test form for operators on Coefficients.
#
# Compile this form with FFC: ffcx CoefficientOperators.ufl
# Compile this form with FFCx: ffcx CoefficientOperators.ufl

element = FiniteElement("Lagrange", triangle, 1)

Expand Down
10 changes: 5 additions & 5 deletions demo/Components.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2011 Garth N. Wells
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# This example demonstrates how to create vectors component-wise
#
# Compile this form with FFC: ffcx Component.ufl
# Compile this form with FFCx: ffcx Component.ufl

element = VectorElement("Lagrange", tetrahedron, 1)

Expand Down
10 changes: 5 additions & 5 deletions demo/Conditional.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2010-2011 Kristian B. Oelgaard
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# Illustration on how to use Conditional to define a source term
#
# Compile this form with FFC: ffcx Conditional.ufl
# Compile this form with FFCx: ffcx Conditional.ufl

element = FiniteElement("Lagrange", triangle, 2)

Expand Down
10 changes: 5 additions & 5 deletions demo/Constant.ufl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Copyright (C) 2007 Anders Logg
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# Test form for scalar and vector constants.
#
# Compile this form with FFC: ffcx Constant.ufl
# Compile this form with FFCx: ffcx Constant.ufl

element = FiniteElement("Lagrange", triangle, 1)

Expand Down
10 changes: 5 additions & 5 deletions demo/Elasticity.ufl
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Copyright (C) 2005 Johan Jansson
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# Modified by Anders Logg 2005-2007
# Modified by Marie E. Rognes 2012
#
# The bilinear form e(v) : e(u) for linear
# elasticity with e(v) = 1/2 (grad(v) + grad(v)^T)
#
# Compile this form with FFC: ffcx Elasticity.ufl
# Compile this form with FFCx: ffcx Elasticity.ufl

element = VectorElement("Lagrange", tetrahedron, 1)

Expand Down
10 changes: 5 additions & 5 deletions demo/EnergyNorm.ufl
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Copyright (C) 2005-2007 Anders Logg
#
# This file is part of FFCX.
# This file is part of FFCx.
#
# FFC is free software: you can redistribute it and/or modify
# FFCx is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# FFC is distributed in the hope that it will be useful,
# FFCx is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with FFC. If not, see <http://www.gnu.org/licenses/>.
# along with FFCx. If not, see <http://www.gnu.org/licenses/>.
#
# This example demonstrates how to define a functional, here
# the energy norm (squared) for a reaction-diffusion problem.
#
# Compile this form with FFC: ffcx EnergyNorm.ufl
# Compile this form with FFCx: ffcx EnergyNorm.ufl

element = FiniteElement("Lagrange", tetrahedron, 1)

Expand Down
Loading

0 comments on commit 52389a2

Please sign in to comment.