From d48c754e561db0353e90f1efcad1fda1b1ddf159 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 9 Aug 2023 13:58:35 -0700 Subject: [PATCH] comment out mshr so it runs --- product_fem/__init__.py | 4 ++-- requirements/conda-environment.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/product_fem/__init__.py b/product_fem/__init__.py index 2ddd314..74a23df 100644 --- a/product_fem/__init__.py +++ b/product_fem/__init__.py @@ -6,8 +6,8 @@ from .functions import ProductFunction, Control, SpatialData from .inverse_problems import InverseProblem, taylor_test from .loss_functionals import LossFunctional, ReducedLossFunctional -from .meshes import polygon_geom, polygon_mesh, convex_hull_geom, convex_hull_mesh, rectangle_geom, rectangle_mesh, ellipse_geom, ellipse_mesh, square_geom, square_mesh, unit_square_geom, unit_square_mesh, disc_geom, disc_mesh, unit_disc_geom, unit_disc_mesh -from mshr import generate_mesh +# from .meshes import polygon_geom, polygon_mesh, convex_hull_geom, convex_hull_mesh, rectangle_geom, rectangle_mesh, ellipse_geom, ellipse_mesh, square_geom, square_mesh, unit_square_geom, unit_square_mesh, disc_geom, disc_mesh, unit_disc_geom, unit_disc_mesh +# from mshr import generate_mesh from .plotting import plot, animate_control from .solvers import Solver from .transforms import to_array, to_Function diff --git a/requirements/conda-environment.yml b/requirements/conda-environment.yml index cb2d9dc..9975368 100644 --- a/requirements/conda-environment.yml +++ b/requirements/conda-environment.yml @@ -14,7 +14,7 @@ dependencies: - slim - bioconda::snakemake - hyperopt - - pyslim>=1.0.1 + - pyslim>=1.0.4 - ffmpeg - quarto - papermill