Skip to content

Commit c87b5c2

Browse files
jorgensdjorgensd
committed
Remove some more xvfb and move new variables
1 parent 579af78 commit c87b5c2

File tree

6 files changed

+72
-129
lines changed

6 files changed

+72
-129
lines changed

‎.github/workflows/book_stable.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
container: ghcr.io/fenics/dolfinx/lab:stable
2020

2121
env:
22-
PYVISTA_OFF_SCREEN: true
22+
PYVISTA_OFF_SCREEN: false
2323
PYVISTA_JUPYTER_BACKEND: html
2424

2525
steps:
@@ -34,7 +34,7 @@ jobs:
3434
python3 -m pip install --no-binary=h5py .[netgen]
3535
3636
- name: Build the book
37-
run: PYVISTA_OFF_SCREEN=false jupyter-book build .
37+
run: jupyter-book build .
3838

3939
- uses: actions/upload-artifact@v4
4040
if: always()

‎.github/workflows/test_stable.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@ on:
55
workflow_call:
66
pull_request:
77
branches: ["release"]
8-
env:
9-
HDF5_MPI: "ON"
10-
HDF5_DIR: "/usr/local/"
11-
DEB_PYTHON_INSTALL_LAYOUT: deb_system
12-
LIBGL_ALWAYS_SOFTWARE: 1
138

149
jobs:
1510
test:
1611
runs-on: ubuntu-latest
1712
container: ghcr.io/fenics/dolfinx/lab:stable
1813
env:
14+
HDF5_MPI: "ON"
15+
HDF5_DIR: "/usr/local/"
16+
DEB_PYTHON_INSTALL_LAYOUT: deb_system
1917
PYVISTA_OFF_SCREEN: true
2018
PYVISTA_JUPYTER_BACKEND: html
19+
LIBGL_ALWAYS_SOFTWARE: 1
2120

2221
# Steps represent a sequence of tasks that will be executed as part of the job
2322
steps:

‎chapter1/fundamentals_code.ipynb‎

Lines changed: 18 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@
6868
"cell_type": "code",
6969
"execution_count": null,
7070
"id": "2",
71-
"metadata": {
72-
"vscode": {
73-
"languageId": "python"
74-
}
75-
},
71+
"metadata": {},
7672
"outputs": [],
7773
"source": [
7874
"from mpi4py import MPI\n",
@@ -105,11 +101,7 @@
105101
"cell_type": "code",
106102
"execution_count": null,
107103
"id": "4",
108-
"metadata": {
109-
"vscode": {
110-
"languageId": "python"
111-
}
112-
},
104+
"metadata": {},
113105
"outputs": [],
114106
"source": [
115107
"from dolfinx.fem import functionspace\n",
@@ -120,11 +112,7 @@
120112
"cell_type": "code",
121113
"execution_count": null,
122114
"id": "5",
123-
"metadata": {
124-
"vscode": {
125-
"languageId": "python"
126-
}
127-
},
115+
"metadata": {},
128116
"outputs": [],
129117
"source": [
130118
"from dolfinx import fem\n",
@@ -146,11 +134,7 @@
146134
"cell_type": "code",
147135
"execution_count": null,
148136
"id": "7",
149-
"metadata": {
150-
"vscode": {
151-
"languageId": "python"
152-
}
153-
},
137+
"metadata": {},
154138
"outputs": [],
155139
"source": [
156140
"import numpy\n",
@@ -180,11 +164,7 @@
180164
"cell_type": "code",
181165
"execution_count": null,
182166
"id": "9",
183-
"metadata": {
184-
"vscode": {
185-
"languageId": "python"
186-
}
187-
},
167+
"metadata": {},
188168
"outputs": [],
189169
"source": [
190170
"boundary_dofs = fem.locate_dofs_topological(V, fdim, boundary_facets)\n",
@@ -208,11 +188,7 @@
208188
"cell_type": "code",
209189
"execution_count": null,
210190
"id": "11",
211-
"metadata": {
212-
"vscode": {
213-
"languageId": "python"
214-
}
215-
},
191+
"metadata": {},
216192
"outputs": [],
217193
"source": [
218194
"import ufl\n",
@@ -233,11 +209,7 @@
233209
"cell_type": "code",
234210
"execution_count": null,
235211
"id": "13",
236-
"metadata": {
237-
"vscode": {
238-
"languageId": "python"
239-
}
240-
},
212+
"metadata": {},
241213
"outputs": [],
242214
"source": [
243215
"from dolfinx import default_scalar_type\n",
@@ -261,11 +233,7 @@
261233
"cell_type": "code",
262234
"execution_count": null,
263235
"id": "15",
264-
"metadata": {
265-
"vscode": {
266-
"languageId": "python"
267-
}
268-
},
236+
"metadata": {},
269237
"outputs": [],
270238
"source": [
271239
"a = ufl.dot(ufl.grad(u), ufl.grad(v)) * ufl.dx\n",
@@ -306,11 +274,7 @@
306274
"cell_type": "code",
307275
"execution_count": null,
308276
"id": "17",
309-
"metadata": {
310-
"vscode": {
311-
"languageId": "python"
312-
}
313-
},
277+
"metadata": {},
314278
"outputs": [],
315279
"source": [
316280
"from dolfinx.fem.petsc import LinearProblem\n",
@@ -332,11 +296,7 @@
332296
"cell_type": "code",
333297
"execution_count": null,
334298
"id": "19",
335-
"metadata": {
336-
"vscode": {
337-
"languageId": "python"
338-
}
339-
},
299+
"metadata": {},
340300
"outputs": [],
341301
"source": [
342302
"V2 = fem.functionspace(domain, (\"Lagrange\", 2))\n",
@@ -357,11 +317,7 @@
357317
"cell_type": "code",
358318
"execution_count": null,
359319
"id": "21",
360-
"metadata": {
361-
"vscode": {
362-
"languageId": "python"
363-
}
364-
},
320+
"metadata": {},
365321
"outputs": [],
366322
"source": [
367323
"L2_error = fem.form(ufl.inner(uh - uex, uh - uex) * ufl.dx)\n",
@@ -386,11 +342,7 @@
386342
"cell_type": "code",
387343
"execution_count": null,
388344
"id": "23",
389-
"metadata": {
390-
"vscode": {
391-
"languageId": "python"
392-
}
393-
},
345+
"metadata": {},
394346
"outputs": [],
395347
"source": [
396348
"error_max = numpy.max(numpy.abs(uD.x.array-uh.x.array))\n",
@@ -429,15 +381,10 @@
429381
"cell_type": "code",
430382
"execution_count": null,
431383
"id": "26",
432-
"metadata": {
433-
"vscode": {
434-
"languageId": "python"
435-
}
436-
},
384+
"metadata": {},
437385
"outputs": [],
438386
"source": [
439387
"from dolfinx import plot\n",
440-
"pyvista.start_xvfb()\n",
441388
"domain.topology.create_connectivity(tdim, tdim)\n",
442389
"topology, cell_types, geometry = plot.vtk_mesh(domain, tdim)\n",
443390
"grid = pyvista.UnstructuredGrid(topology, cell_types, geometry)"
@@ -464,11 +411,7 @@
464411
"cell_type": "code",
465412
"execution_count": null,
466413
"id": "29",
467-
"metadata": {
468-
"vscode": {
469-
"languageId": "python"
470-
}
471-
},
414+
"metadata": {},
472415
"outputs": [],
473416
"source": [
474417
"plotter = pyvista.Plotter()\n",
@@ -493,11 +436,7 @@
493436
"cell_type": "code",
494437
"execution_count": null,
495438
"id": "31",
496-
"metadata": {
497-
"vscode": {
498-
"languageId": "python"
499-
}
500-
},
439+
"metadata": {},
501440
"outputs": [],
502441
"source": [
503442
"u_topology, u_cell_types, u_geometry = plot.vtk_mesh(V)"
@@ -515,11 +454,7 @@
515454
"cell_type": "code",
516455
"execution_count": null,
517456
"id": "33",
518-
"metadata": {
519-
"vscode": {
520-
"languageId": "python"
521-
}
522-
},
457+
"metadata": {},
523458
"outputs": [],
524459
"source": [
525460
"u_grid = pyvista.UnstructuredGrid(u_topology, u_cell_types, u_geometry)\n",
@@ -544,11 +479,7 @@
544479
"cell_type": "code",
545480
"execution_count": null,
546481
"id": "35",
547-
"metadata": {
548-
"vscode": {
549-
"languageId": "python"
550-
}
551-
},
482+
"metadata": {},
552483
"outputs": [],
553484
"source": [
554485
"warped = u_grid.warp_by_scalar()\n",
@@ -571,11 +502,7 @@
571502
"cell_type": "code",
572503
"execution_count": null,
573504
"id": "37",
574-
"metadata": {
575-
"vscode": {
576-
"languageId": "python"
577-
}
578-
},
505+
"metadata": {},
579506
"outputs": [],
580507
"source": [
581508
"from dolfinx import io\n",

0 commit comments

Comments
 (0)