From d67b1f225c0c4605140b6efce9443b03fc9544e6 Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Wed, 14 Oct 2020 16:15:14 -0400 Subject: [PATCH] rm obsolete references to meepgeom::is_file --- libpympb/pympb.cpp | 7 ++----- python/meep.i | 2 -- src/meepgeom.hpp | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libpympb/pympb.cpp b/libpympb/pympb.cpp index 0344f7b85..05b59bf08 100644 --- a/libpympb/pympb.cpp +++ b/libpympb/pympb.cpp @@ -357,12 +357,9 @@ int mode_solver::mean_epsilon(symmetric_matrix *meps, symmetric_matrix *meps_inv bool o1_is_var = o1 && meep_geom::is_variable(o1->material); bool o2_is_var = o2 && meep_geom::is_variable(o2->material); - bool default_is_var_or_file = - meep_geom::is_variable(default_material) || meep_geom::is_file(default_material); + bool default_is_var = meep_geom::is_variable(default_material); - if (o1_is_var || o2_is_var || - (default_is_var_or_file && - (!o1 || !o2 || meep_geom::is_file(o1->material) || meep_geom::is_file(o2->material)))) { + if (o1_is_var || o2_is_var || (default_is_var && (!o1 || !o2))) { return 0; /* arbitrary material functions are non-analyzable */ } diff --git a/python/meep.i b/python/meep.i index 80ef75024..66d2ea8c1 100644 --- a/python/meep.i +++ b/python/meep.i @@ -1464,8 +1464,6 @@ void _get_gradient(PyObject *grad, PyObject *fields_a, PyObject *fields_f, PyObj %ignore material_type_equal; %ignore is_variable; %ignore is_variable; -%ignore is_file; -%ignore is_file; %ignore is_medium; %ignore is_medium; %ignore is_metal; diff --git a/src/meepgeom.hpp b/src/meepgeom.hpp index 990c537f1..a90e375c6 100644 --- a/src/meepgeom.hpp +++ b/src/meepgeom.hpp @@ -183,8 +183,6 @@ bool is_material_grid(material_type mt); bool is_material_grid(void *md); bool is_variable(material_type mt); bool is_variable(void *md); -bool is_file(material_type md); -bool is_file(void *md); bool is_medium(material_type md, medium_struct **m); bool is_medium(void *md, medium_struct **m); bool is_metal(meep::field_type ft, const material_type *material);