From 94d848f51f3925bba1c30b689a3d5e7a0ea65ff6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 2 Aug 2024 12:42:28 +0200 Subject: [PATCH] spns #42665: MeshIO: GMSH and ANSYS (IV) --- products/compil_scripts/meshio-4.3.13.sh | 2 +- products/compil_scripts/meshio-5.3.4.sh | 2 +- products/compil_scripts/meshio-5.3.5.sh | 2 +- products/patches/meshio-5.3.5.p01.gmsh_ansys.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/products/compil_scripts/meshio-4.3.13.sh b/products/compil_scripts/meshio-4.3.13.sh index 45d7cc0..1f9bf39 100755 --- a/products/compil_scripts/meshio-4.3.13.sh +++ b/products/compil_scripts/meshio-4.3.13.sh @@ -29,7 +29,7 @@ done # bos #42618 - https://github.com/nschloe/meshio/issues/1484 fPy=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages/meshio/gmsh/main.py if [ -f $fPy ]; then - sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy + sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh40": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy if [ $? -ne 0 ]; then echo "FATAL: could not apply fixes to GMSH MeshIO driver" exit 1 diff --git a/products/compil_scripts/meshio-5.3.4.sh b/products/compil_scripts/meshio-5.3.4.sh index 667e5ed..756844b 100755 --- a/products/compil_scripts/meshio-5.3.4.sh +++ b/products/compil_scripts/meshio-5.3.4.sh @@ -51,7 +51,7 @@ fi # bos #42618 - https://github.com/nschloe/meshio/issues/1484 fPy=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages/meshio/gmsh/main.py if [ -f $fPy ]; then - sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy + sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh40": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy if [ $? -ne 0 ]; then echo "FATAL: could not apply fixes to GMSH MeshIO driver" exit 1 diff --git a/products/compil_scripts/meshio-5.3.5.sh b/products/compil_scripts/meshio-5.3.5.sh index 02ed832..02ae829 100755 --- a/products/compil_scripts/meshio-5.3.5.sh +++ b/products/compil_scripts/meshio-5.3.5.sh @@ -43,7 +43,7 @@ fi # bos #42618 - https://github.com/nschloe/meshio/issues/1484 fPy=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages/meshio/gmsh/main.py if [ -f $fPy ]; then - sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy + sed -i 's/"gmsh": lambda f, m, \*\*kwargs: write(f, m, "4.1", \*\*kwargs)/"gmsh40": lambda f, m, \*\*kwargs: write(f, m, "4.0", \*\*kwargs)/g' $fPy if [ $? -ne 0 ]; then echo "FATAL: could not apply fixes to GMSH MeshIO driver" exit 1 diff --git a/products/patches/meshio-5.3.5.p01.gmsh_ansys.patch b/products/patches/meshio-5.3.5.p01.gmsh_ansys.patch index a0d8e16..ade25ef 100644 --- a/products/patches/meshio-5.3.5.p01.gmsh_ansys.patch +++ b/products/patches/meshio-5.3.5.p01.gmsh_ansys.patch @@ -5,7 +5,7 @@ { "gmsh22": lambda f, m, **kwargs: write(f, m, "2.2", **kwargs), - "gmsh": lambda f, m, **kwargs: write(f, m, "4.1", **kwargs), -+ "gmsh": lambda f, m, **kwargs: write(f, m, "4.0", **kwargs), ++ "gmsh40": lambda f, m, **kwargs: write(f, m, "4.0", **kwargs), }, ) --- meshio-5.3.5_ref/src/meshio/ansys/_ansys.py 2024-01-31 16:09:01.000000000 +0100 -- 2.39.2