From dfc4edf2f7b05ca2f2af148c88d391474f37057c Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Sat, 3 Jun 2017 02:30:51 -0400 Subject: [PATCH 1/8] trying mkdocs stuff on master branch as readthedocs seems to have trouble with other branches --- index.md | 1 + mkdocs.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 index.md create mode 100644 mkdocs.yml diff --git a/index.md b/index.md new file mode 100644 index 000000000..12b9c54e7 --- /dev/null +++ b/index.md @@ -0,0 +1 @@ +Hello, this is index. diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 000000000..0cd859856 --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,27 @@ +site_name: MEEP documentation +site_author: Homer Reid +repo_url: https://github.com/homerreid/meep/ + +pages: +- 'Index': 'index.md' + +#docs_dir: 'doc' +#site_dir: + +#theme_dir: 'meep-mkdocs-theme' +#theme: readthedocs + +#python: +# version: 2 # for unicode +# setup_py_install: True + +#markdown_extensions: +# - wikilinks +# - toc: +# title: Table of Contents +# - attr_list +# - fenced_code +# - mdx_math: +# enable_dollar_delimiter: True + +#extra_javascript: ['https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML','mathjaxhelper.js'] From 59b231569914d9a57205ebbf1b9b612ffb3b3aa4 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Sat, 10 Jun 2017 12:24:29 -0400 Subject: [PATCH 2/8] synced with stevengj/master --- mkdocs.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 mkdocs.yml diff --git a/mkdocs.yml b/mkdocs.yml deleted file mode 100644 index 0cd859856..000000000 --- a/mkdocs.yml +++ /dev/null @@ -1,27 +0,0 @@ -site_name: MEEP documentation -site_author: Homer Reid -repo_url: https://github.com/homerreid/meep/ - -pages: -- 'Index': 'index.md' - -#docs_dir: 'doc' -#site_dir: - -#theme_dir: 'meep-mkdocs-theme' -#theme: readthedocs - -#python: -# version: 2 # for unicode -# setup_py_install: True - -#markdown_extensions: -# - wikilinks -# - toc: -# title: Table of Contents -# - attr_list -# - fenced_code -# - mdx_math: -# enable_dollar_delimiter: True - -#extra_javascript: ['https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML','mathjaxhelper.js'] From 7b4a40abaa560ce8ce26c718af4e5d83e21fad92 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Sun, 11 Jun 2017 02:16:08 -0400 Subject: [PATCH 3/8] sync with stevenj master --- index.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 index.md diff --git a/index.md b/index.md deleted file mode 100644 index 12b9c54e7..000000000 --- a/index.md +++ /dev/null @@ -1 +0,0 @@ -Hello, this is index. From bcaec1ef476f592baafb18d54d01fe5b21b4c797 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 27 Jul 2017 19:27:03 -0400 Subject: [PATCH 4/8] updates --- libmeepgeom/meepgeom.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libmeepgeom/meepgeom.cpp b/libmeepgeom/meepgeom.cpp index 0822ebb92..4261af953 100644 --- a/libmeepgeom/meepgeom.cpp +++ b/libmeepgeom/meepgeom.cpp @@ -1532,5 +1532,4 @@ void set_materials_from_geometry(meep::structure *s, master_printf("-----------\n"); } - } // namespace meep_geom From 529207f6198461b147306726e37e82a083fce496 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 19 Oct 2017 16:00:24 -0400 Subject: [PATCH 5/8] remove unnecessary libhdf5-serial-dev package from .travis build; restore in python/Makefile.am to ensure python tests are executed under mpirun when building --with-mpi --- .travis.yml | 1 - python/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a5238444..3761c1116 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: - libgsl0-dev - libfftw3-dev - gfortran - - libhdf5-serial-dev - liblapack-dev - swig - libopenmpi-dev diff --git a/python/Makefile.am b/python/Makefile.am index 8ddf43fee..a8590aee1 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -36,7 +36,7 @@ TESTS = \ $(TEST_DIR)/source.py TEST_EXTENSIONS = .py -PY_LOG_COMPILER = $(PYTHON) +PY_LOG_COMPILER = $(RUNCODE) $(PYTHON) TESTS_ENVIRONMENT = export PYTHONPATH=$(abs_top_builddir)/python:$$PYTHONPATH; if WITH_PYTHON From ffef675e6d37f2643d43bbe97ea0f8b5a235a771 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 19 Oct 2017 18:41:00 -0400 Subject: [PATCH 6/8] restored libhdf5-dev to package prerequisites (still omitting libhdf5-serial-dev) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3761c1116..756a617a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: - gfortran - liblapack-dev - swig + - libhdf5-dev - libopenmpi-dev - mpi-default-bin - openmpi-bin From bd54090fba0493164c6af8066d76d970ea1bef4a Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 19 Oct 2017 19:30:18 -0400 Subject: [PATCH 7/8] updates --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 756a617a0..dfc7b8411 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: - gfortran - liblapack-dev - swig - - libhdf5-dev + - libhdf5-serial-dev - libopenmpi-dev - mpi-default-bin - openmpi-bin From 9915bd56a3a54288f5f1d70de84bd58fd650e90f Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 19 Oct 2017 19:45:13 -0400 Subject: [PATCH 8/8] updates --- libmeepgeom/Makefile.am | 2 ++ python/Makefile.am | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libmeepgeom/Makefile.am b/libmeepgeom/Makefile.am index b0275653a..5fdb713fb 100644 --- a/libmeepgeom/Makefile.am +++ b/libmeepgeom/Makefile.am @@ -32,6 +32,8 @@ array_slice_ll_LDADD = libmeepgeom.la $(MEEPLIBS) TESTS = cyl-ellipsoid-ll array-slice-ll +#LOG_COMPILER = $(RUNCODE) + noinst_PROGRAMS = bend-flux-ll bend_flux_ll_SOURCES = bend-flux-ll.cpp diff --git a/python/Makefile.am b/python/Makefile.am index a8590aee1..64df6112a 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -21,6 +21,13 @@ _meep_la_LIBADD = $(top_builddir)/src/libmeep@MEEP_SUFFIX@.la $(top_builddir)/li _meep_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@ _meep_la_CPPFLAGS = $(PYTHON_INCLUDES) $(AM_CPPFLAGS) +# material_dispersion.py test must be excluded from test suite for MPI build +if WITH_MPI + MDPYTEST= +else + MDPYTEST=$(TEST_DIR)/material_dispersion.py +endif + TEST_DIR = tests TESTS = \ $(TEST_DIR)/3rd_harm_1d.py \ @@ -29,7 +36,7 @@ TESTS = \ $(TEST_DIR)/geom.py \ $(TEST_DIR)/holey_wvg_bands.py \ $(TEST_DIR)/holey_wvg_cavity.py \ - $(TEST_DIR)/material_dispersion.py \ + $(MDPYTEST) \ $(TEST_DIR)/physical.py \ $(TEST_DIR)/ring.py \ $(TEST_DIR)/simulation.py \