From dfc4edf2f7b05ca2f2af148c88d391474f37057c Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Sat, 3 Jun 2017 02:30:51 -0400 Subject: [PATCH 1/6] 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/6] 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/6] 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/6] 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 38cd77cf9b033e69fb316a7085df6d0253eea0ce Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 18 Jan 2018 18:49:42 -0500 Subject: [PATCH 5/6] update MPI-enabled pymeep startup message to mimic that of libctl meep binary --- python/meep.i | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/meep.i b/python/meep.i index 09ed64a3e..7b16a7bc0 100644 --- a/python/meep.i +++ b/python/meep.i @@ -882,7 +882,9 @@ void display_geometric_object_info(int indentby, GEOMETRIC_OBJECT o); else: # this variable reference is needed for lazy initialization of MPI comm = MPI.COMM_WORLD - master_printf('\n**\n** successfully loaded python MPI module (mpi4py)\n**\n') + Procs=comm.Get_size() + (Major,Minor)=MPI.Get_version(); + print('Using MPI version {}.{}, {} processes'.format(Major, Minor, Procs)); if not am_master(): import os From df276f8a7fa52fddcf3dff4b17a294f9563aaa57 Mon Sep 17 00:00:00 2001 From: Homer Reid Date: Thu, 18 Jan 2018 19:36:42 -0500 Subject: [PATCH 6/6] ensure MPI startup message in pymeep is only printed by master process --- python/meep.i | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/meep.i b/python/meep.i index 7b16a7bc0..c090d981d 100644 --- a/python/meep.i +++ b/python/meep.i @@ -882,9 +882,10 @@ void display_geometric_object_info(int indentby, GEOMETRIC_OBJECT o); else: # this variable reference is needed for lazy initialization of MPI comm = MPI.COMM_WORLD - Procs=comm.Get_size() - (Major,Minor)=MPI.Get_version(); - print('Using MPI version {}.{}, {} processes'.format(Major, Minor, Procs)); + if am_master(): + Procs=comm.Get_size() + (Major,Minor)=MPI.Get_version(); + print('Using MPI version {}.{}, {} processes'.format(Major, Minor, Procs)); if not am_master(): import os