Merge pull request #12 from METHODS-Group/typo

n -> n_g and minor QOL for julia

Author: jorgensd

.github/workflows/build-docker-image.yml

@@ -3,10 +3,10 @@ on:
   push:
     tags:
       - "v*"
-  pull_request:
-    branches:
-      - release
-      - main
+  # pull_request:
+  #   branches:
+  #     - release
+  #     - main
   workflow_dispatch:
 
 env:
@@ -17,10 +17,10 @@ jobs:
   build-image:
     strategy:
       matrix:
-        backend: ["firedrake", "dolfinx", "mfem"]
+        backend: ["firedrake", "dolfinx", "mfem", "julia"]
         platform: [
             { runner: "ubuntu-24.04", platform: amd64 },
-            #{ runner: "ubuntu-24.04-arm", platform: arm64 }, # NOTE: Skip arm until repo is public
+            { runner: "ubuntu-24.04-arm", platform: arm64 }
           ]
     runs-on: ${{ matrix.platform.runner }}
     permissions:
@@ -79,7 +79,7 @@ jobs:
           retention-days: 1
 
   merge-and-publish:
-    #if: github.event_name == 'push'
+    if: github.event_name == 'push'
     strategy:
       matrix:
         backend: ["firedrake", "dolfinx", "mfem"]

.github/workflows/test_julia.yml

@@ -1,19 +1,19 @@
 name: Run Julia scripts
 
 on:
-  #   push:
-  #     # The CI is executed on every push on to main
-  #     branches:
-  #       - main
-  #   pull_request:
-  #     # The CI is executed on every pull request to the main branch
-  #     branches:
-  #       - main
+    push:
+      # The CI is executed on every push on to main
+      branches:
+        - main
+    pull_request:
+      # The CI is executed on every pull request to the main branch
+      branches:
+        - main
 
-  #   schedule:
-  #     # The CI is executed every day at 8am
-  #     - cron: "0 8 * * *"
-  workflow_dispatch:
+    schedule:
+      # The CI is executed every day at 8am
+      - cron: "0 8 * * *"
+    workflow_dispatch:
     # The CI is executed manually
 jobs:
   run-script:
@@ -34,4 +34,4 @@ jobs:
 
       - name: Run thermoform
         working-directory: ./examples/thermoforming_qvi
-        run: julia thermoform.jl
+        run: julia thermoforming_lvpp.jl

README.md

@@ -74,8 +74,10 @@ Then call
 
 ```bash
 python3 generate_mesh.py
+python3 run_lvpp_problem.py --disp=-0.1 --alpha_0=0.005   --output=small_disp file --filename=meshes/half_sphere.xdmf
+python3 run_lvpp_problem.py --disp=-0.15 --alpha_0=0.005   --output=med_disp file --filename=meshes/half_sphere.xdmf
+python3 run_lvpp_problem.py --disp=-0.2 --alpha_0=0.005   --output=large_disp file --filename=meshes/half_sphere.xdmf
 ```
-
 from within `examples/signorini` to generate the mesh file `"meshes/half_sphere.xdmf"`.
 Next, run the proximal Galerkin method with
 

docker/Dockerfile.julia

@@ -0,0 +1,8 @@
+FROM julia:1.10.8
+
+RUN julia -e 'using Pkg; Pkg.add(["ClassicalOrthogonalPolynomials", "MultivariateOrthogonalPolynomials", "Plots", "LaTeXStrings", "IterativeSolvers", "LinearMaps", "MatrixFactorizations", "Gridap", "LineSearches"])'
+
+WORKDIR /root/examples
+ADD . .
+
+ENTRYPOINT [ "/bin/bash" ]

examples/signorini/run_lvpp_problem.py

@@ -59,17 +59,17 @@ class CustomParser(
 physical_parameters.add_argument("--E", dest="E", type=float, default=2.0e4, help="Young's modulus")
 physical_parameters.add_argument("--nu", dest="nu", type=float, default=0.3, help="Poisson's ratio")
 physical_parameters.add_argument(
-    "--disp", type=float, default=-0.2, help="Displacement in the y/z direction (2D/3D)"
+    "--disp", type=float, default=-0.25, help="Displacement in the y/z direction (2D/3D)"
 )
 physical_parameters.add_argument(
-    "--gap", type=float, default=-0.05, help="y/z coordinate of rigid surface (2D/3D)"
+    "--gap", type=float, default=-0.00, help="y/z coordinate of rigid surface (2D/3D)"
 )
 fem_parameters = parser.add_argument_group("FEM parameters")
 fem_parameters.add_argument(
     "--degree",
     dest="degree",
     type=int,
-    default=1,
+    default=2,
     help="Degree of primal and latent space",
 )
 fem_parameters.add_argument(
@@ -81,7 +81,7 @@ class CustomParser(
     "--n-max-iterations",
     dest="newton_max_iterations",
     type=int,
-    default=25,
+    default=250,
     help="Maximum number of iterations of Newton iteration",
 )
 newton_parameters.add_argument(
@@ -113,7 +113,7 @@ class CustomParser(
 alpha_options.add_argument(
     "--alpha_scheme",
     type=str,
-    default="constant",
+    default="doubling",
     choices=typing.get_args(AlphaScheme),
     help="Scheme for updating alpha",
 )
@@ -240,7 +240,6 @@ def solve_contact_problem(
     # Define problem specific parameters
     mu = E / (2.0 * (1.0 + nu))
     lmbda = E * nu / ((1.0 + nu) * (1.0 - 2.0 * nu))
-    n = ufl.FacetNormal(mesh)
     n_g = dolfinx.fem.Constant(mesh, np.zeros(gdim, dtype=dst))
     n_g.value[-1] = -1
     alpha = dolfinx.fem.Constant(mesh, dst(alpha_0))
@@ -252,7 +251,7 @@ def solve_contact_problem(
     residual = alpha * ufl.inner(sigma(u, mu, lmbda), epsilon(v)) * ufl.dx(
         domain=mesh
     ) - alpha * ufl.inner(f, v) * ufl.dx(domain=mesh)
-    residual += -ufl.inner(psi - psi_k, ufl.dot(v, n)) * ds
+    residual += -ufl.inner(psi - psi_k, ufl.dot(v, n_g)) * ds
     residual += ufl.inner(ufl.dot(u, n_g), w) * ds
     residual += ufl.inner(ufl.exp(psi), w) * ds - ufl.inner(g, w) * ds
 
@@ -371,7 +370,6 @@ def assemble_penetration():
     return it, iterations
 
 
-# python3 script.py --alpha_0=0.1 --degree=2 file --filename=sphere.xdmf
 if __name__ == "__main__":
     args = parser.parse_args()
     if args.mesh == "native":