Tidy up syntax (FEniCS#2793)

* Tidy up some syntax

* Add dispatch for sonarcloud

* Bump sonarcloud java version

* Use https

* Concepts update

Author: garth-wells

.github/workflows/sonarcloud.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
+
+
 jobs:
   build:
     name: Build
@@ -27,11 +30,11 @@ jobs:
         run: |
           apt-get -y update
           apt-get install unzip
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

COPYING.LESSER

@@ -1,7 +1,7 @@
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions. 
+  0. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU
@@ -111,7 +111,7 @@ the following:
        a copy of the Library already present on the user's computer
        system, and (b) will operate properly with a modified version
        of the Library that is interface-compatible with the Linked
-       Version. 
+       Version.
 
    e) Provide Installation Information, but only if you would otherwise
    be required to provide such information under section 6 of the

README.md

@@ -192,7 +192,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with DOLFINx. If not, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
 ## Contact
 

cpp/dolfinx/common/IndexMap.cpp

@@ -360,7 +360,7 @@ IndexMap::IndexMap(MPI_Comm comm, std::int32_t local_size,
 
   // Get global offset (index), using partial exclusive reduction
   std::int64_t offset = 0;
-  const std::int64_t local_size_tmp = (std::int64_t)local_size;
+  const std::int64_t local_size_tmp = local_size;
   MPI_Request request_scan;
   int ierr = MPI_Iexscan(&local_size_tmp, &offset, 1, MPI_INT64_T, MPI_SUM,
                          comm, &request_scan);

cpp/dolfinx/fem/DirichletBC.h

@@ -291,10 +291,12 @@ class DirichletBC
   /// @note The size of of `g` must be equal to the block size if `V`.
   /// Use the Function version if this is not the case, e.g. for some
   /// mixed spaces.
-  template <typename S, std::convertible_to<std::vector<std::int32_t>> X,
+  template <typename S, typename X,
             typename
             = std::enable_if_t<std::is_convertible_v<S, T>
                                or std::is_convertible_v<S, std::span<const T>>>>
+    requires std::is_convertible_v<std::remove_cvref_t<X>,
+                                   std::vector<std::int32_t>>
   DirichletBC(const S& g, X&& dofs, std::shared_ptr<const FunctionSpace<U>> V)
       : DirichletBC(std::make_shared<Constant<T>>(g), dofs, V)
   {
@@ -315,7 +317,9 @@ class DirichletBC
   /// @note The size of of `g` must be equal to the block size if `V`.
   /// Use the Function version if this is not the case, e.g. for some
   /// mixed spaces.
-  template <std::convertible_to<std::vector<std::int32_t>> X>
+  template <typename X>
+    requires std::is_convertible_v<std::remove_cvref_t<X>,
+                                   std::vector<std::int32_t>>
   DirichletBC(std::shared_ptr<const Constant<T>> g, X&& dofs,
               std::shared_ptr<const FunctionSpace<U>> V)
       : _function_space(V), _g(g), _dofs0(std::forward<X>(dofs)),
@@ -363,7 +367,9 @@ class DirichletBC
   /// @note The indices in `dofs` are for *blocks*, e.g. a block index
   /// corresponds to 3 degrees-of-freedom if the dofmap associated with
   /// `g` has block size 3.
-  template <std::convertible_to<std::vector<std::int32_t>> X>
+  template <typename X>
+    requires std::is_convertible_v<std::remove_cvref_t<X>,
+                                   std::vector<std::int32_t>>
   DirichletBC(std::shared_ptr<const Function<T, U>> g, X&& dofs)
       : _function_space(g->function_space()), _g(g),
         _dofs0(std::forward<X>(dofs)),

cpp/dolfinx/io/XDMFFile.cpp

@@ -76,7 +76,7 @@ XDMFFile::XDMFFile(MPI_Comm comm, const std::filesystem::path& filename,
     pugi::xml_node xdmf_node = _xml_doc->append_child("Xdmf");
     assert(xdmf_node);
     xdmf_node.append_attribute("Version") = "3.0";
-    xdmf_node.append_attribute("xmlns:xi") = "http://www.w3.org/2001/XInclude";
+    xdmf_node.append_attribute("xmlns:xi") = "https://www.w3.org/2001/XInclude";
 
     pugi::xml_node domain_node = xdmf_node.append_child("Domain");
     if (!domain_node)
@@ -108,7 +108,7 @@ XDMFFile::XDMFFile(MPI_Comm comm, const std::filesystem::path& filename,
       assert(xdmf_node);
       xdmf_node.append_attribute("Version") = "3.0";
       xdmf_node.append_attribute("xmlns:xi")
-          = "http://www.w3.org/2001/XInclude";
+          = "https://www.w3.org/2001/XInclude";
 
       pugi::xml_node domain_node = xdmf_node.append_child("Domain");
       if (!domain_node)

cpp/dolfinx/mesh/Topology.cpp

@@ -76,8 +76,6 @@ determine_sharing_ranks(MPI_Comm comm, std::span<const std::int64_t> indices)
     auto it = dest_to_index.begin();
     while (it != dest_to_index.end())
     {
-      // const int neigh_rank = dest.size();
-
       // Store global rank and find iterator to next global rank
       dest.push_back((*it)[0]);
       auto it1
@@ -763,7 +761,7 @@ std::int32_t Topology::create_entities(int dim)
     return -1;
 
   // Create local entities
-  const auto [cell_entity, entity_vertex, index_map, interprocess_entities]
+  auto [cell_entity, entity_vertex, index_map, interprocess_entities]
       = compute_entities(_comm.comm(), *this, dim);
 
   if (cell_entity)

docker/Dockerfile.redhat

@@ -21,33 +21,33 @@ RUN dnf -y update && \
     dnf config-manager --set-enabled crb && \
     dnf install -y epel-release && \
     dnf -y install \
-      bison \
-      boost-devel \
-      boost-filesystem \
-      boost-timer \
-      boost-program-options \
-      cmake \
-      gcc \
-      gcc-c++ \
-      gcc-gfortran \
-      pugixml-devel \
-      python3 \
-      python3-devel \
-      python3-pip \
-      # Required for PETSc build
-      diffutils \
-      findutils \
-      flex \
-      # Utility
-      git \
-      # Only in crb set
-      ninja-build \
-      openblas-devel && \
+    bison \
+    boost-devel \
+    boost-filesystem \
+    boost-timer \
+    boost-program-options \
+    cmake \
+    gcc \
+    gcc-c++ \
+    gcc-gfortran \
+    pugixml-devel \
+    python3 \
+    python3-devel \
+    python3-pip \
+    # Required for PETSc build
+    diffutils \
+    findutils \
+    flex \
+    # Utility
+    git \
+    # Only in crb set
+    ninja-build \
+    openblas-devel && \
     dnf -y clean all && \
     rm -rf /var/cache
 
 # Build MPICH (see https://github.com/pmodels/mpich/issues/5811)
-RUN curl -L -O http://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz && \
+RUN curl -L -O https://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz && \
     tar -xf mpich-${MPICH_VERSION}.tar.gz && \
     cd mpich-${MPICH_VERSION} && \
     FCFLAGS=-fallow-argument-mismatch FFLAGS=-fallow-argument-mismatch ./configure --with-device=ch4:ofi --enable-shared --prefix=/usr/local && \
@@ -69,24 +69,24 @@ RUN python3 -m pip install --no-binary="numpy" --no-cache-dir cffi numba mpi4py
     python3 -m pip install --no-cache-dir cppimport pytest pytest-xdist scipy matplotlib
 
 # Build PETSc
-RUN curl -L -O http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-${PETSC_VERSION}.tar.gz && \
+RUN curl -L -O https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-${PETSC_VERSION}.tar.gz && \
     mkdir petsc && \
     tar -xf petsc-lite-${PETSC_VERSION}.tar.gz -C petsc --strip-components=1 && \
     cd petsc && \
     python3 ./configure \
-      --with-shared-libraries \
-      --with-fortran-bindings=no \
-      --with-scalar-type=real \
-      --with-64-bit-indices=yes \
-      --with-debugging=yes \
-      --download-ptscotch \
-      --download-hypre \
-      --download-metis \
-      --download-mumps \
-      --download-scalapack \
-      --download-superlu_dist \
-      --prefix=/usr/local \
-      --with-make-np=${BUILD_NP} && \
+    --with-shared-libraries \
+    --with-fortran-bindings=no \
+    --with-scalar-type=real \
+    --with-64-bit-indices=yes \
+    --with-debugging=yes \
+    --download-ptscotch \
+    --download-hypre \
+    --download-metis \
+    --download-mumps \
+    --download-scalapack \
+    --download-superlu_dist \
+    --prefix=/usr/local \
+    --with-make-np=${BUILD_NP} && \
     make all && \
     make install && \
     cd src/binding/petsc4py && \

docker/Dockerfile.test-env

@@ -132,7 +132,7 @@ RUN apt-get -qq update && \
 
 # Install MPI
 RUN if [ "$MPI" = "mpich" ]; then \
-    wget http://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz && \
+    wget https://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz && \
     tar xfz mpich-${MPICH_VERSION}.tar.gz  && \
     cd mpich-${MPICH_VERSION}  && \
     ./configure ${MPICH_CONFIGURE_OPTIONS} && \
@@ -201,7 +201,7 @@ ENV PYTHONPATH=/usr/local/lib:$PYTHONPATH
 ENV PETSC_DIR=/usr/local/petsc SLEPC_DIR=/usr/local/slepc
 RUN apt-get -qq update && \
     apt-get -y install bison flex && \
-    wget -nc --quiet http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-${PETSC_VERSION}.tar.gz -O petsc-${PETSC_VERSION}.tar.gz && \
+    wget -nc --quiet https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-${PETSC_VERSION}.tar.gz -O petsc-${PETSC_VERSION}.tar.gz && \
     mkdir -p ${PETSC_DIR} && tar -xf petsc-${PETSC_VERSION}.tar.gz -C ${PETSC_DIR} --strip-components 1 && \
     cd ${PETSC_DIR} && \
     # Real32, 32-bit int

python/doc/source/installation.rst

@@ -32,14 +32,14 @@ C++ core
 .. rubric:: Required
 
 - C++ compiler (supporting the C++20 standard)
-- `Boost <http://www.boost.org>`_, with the following compiled Boost
+- `Boost <https://www.boost.org>`_, with the following compiled Boost
   components
 
   - timer
 
 - `CMake <https://cmake.org>`_ [build dependency]
 - `pkg-config <https://www.freedesktop.org/wiki/Software/pkg-config/>`_
-- `Basix <http://github.com/FEniCS/basix>`_
+- `Basix <https://github.com/FEniCS/basix>`_
 - `pugixml <https://pugixml.org/>`_
 - UFCx [``ufcx.h``, provided by FFCx]
 - MPI
@@ -64,9 +64,9 @@ Below are additional requirements for the Python interface.
 .. rubric:: Required
 
 - Python
-- FFCx, UFL and Basix (http://github.com/FEniCS/).
+- FFCx, UFL and Basix (https://github.com/FEniCS/).
 - pybind11 (https://github.com/pybind/pybind11)
-- NumPy (http://www.numpy.org)
+- NumPy (https://www.numpy.org)
 - mpi4py
 - petsc4py
 

python/dolfinx/io/gmshio.py

@@ -26,7 +26,7 @@
 
 
 # Map from Gmsh cell type identifier (integer) to DOLFINx cell type and
-# degree http://gmsh.info//doc/texinfo/gmsh.html#MSH-file-format
+# degree https://gmsh.info//doc/texinfo/gmsh.html#MSH-file-format
 _gmsh_to_cells = {1: ("interval", 1), 2: ("triangle", 1),
                   3: ("quadrilateral", 1), 4: ("tetrahedron", 1),
                   5: ("hexahedron", 1), 8: ("interval", 2),
@@ -41,7 +41,7 @@
 def ufl_mesh(gmsh_cell: int, gdim: int) -> ufl.Mesh:
     """Create a UFL mesh from a Gmsh cell identifier and geometric dimension.
 
-    See http://gmsh.info//doc/texinfo/gmsh.html#MSH-file-format.
+    See https://gmsh.info//doc/texinfo/gmsh.html#MSH-file-format.
 
     Args:
         gmsh_cell: Gmsh cell identifier.

python/test/unit/fem/test_dofmap.py

@@ -142,7 +142,7 @@ def test_entity_closure_dofs(mesh_factory):
         assert set(V.dofmap.entity_closure_dofs(mesh, d, all_cells)) == set(range(V.dim))
 
 
-def test_block_size(mesh):
+def test_block_size():
     meshes = [create_unit_square(MPI.COMM_WORLD, 8, 8),
               create_unit_cube(MPI.COMM_WORLD, 4, 4, 4),
               create_unit_square(MPI.COMM_WORLD, 8, 8, CellType.quadrilateral),

python/test/unit/fem/test_function.py

@@ -176,7 +176,7 @@ def f(x):
     # (np.float32, "float"),  # Fails on Redhat CI, needs further investigation
     (np.float64, "double")
 ])
-def test_cffi_expression(types, V):
+def test_cffi_expression(types):
     vtype, xtype = types
     mesh = create_unit_cube(MPI.COMM_WORLD, 3, 3, 3, dtype=vtype)
     V = FunctionSpace(mesh, ('Lagrange', 1))

python/test/unit/fem/test_function_space.py

@@ -89,7 +89,7 @@ def test_component(V, W, Q):
 def test_equality(V, V2, W, W2):
     assert V == V  # /NOSONAR
     assert V == V2
-    assert W == W
+    assert W == W  # /NOSONAR
     assert W == W2