Flatten layout of demo directories.

Kaicheng-Yang0828 · Jan 21, 2019 · 94ef41d · 94ef41d
1 parent 893d2d3
commit 94ef41d
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,6 @@ build_demo.*
 test_*_tempdir
 /python/demo/**/*.py
 /python/demo/**/*.xml
-/python/demo/undocumented/mesh-quality/mesh-quality.pdf
 /cpp/demo/**/*.ufl
 /cpp/demo/**/*.cpp
 /cpp/demo/**/*.c

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -323,7 +323,7 @@ endif()
 # and tests
 
 set(COPY_DEMO_TEST_DEMO_DATA FALSE)
-if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/Poisson.h)
+if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/poisson/Poisson.h)
   message(STATUS "")
   message(STATUS "Generating form files in demo and test and directories. May take some time...")
   message(STATUS "----------------------------------------------------------------------------------------")
@@ -337,8 +337,8 @@ if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poiss
 
   if (FORM_GENERATION_RESULT)
     # Cleanup so download is triggered next time we run cmake
-    if (EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/Poisson.h)
-      file(REMOVE ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/Poisson.h)
+    if (EXISTS ${DOLFIN_SOURCE_DIR}/demo/poisson/Poisson.h)
+      file(REMOVE ${DOLFIN_SOURCE_DIR}/demo/poisson/Poisson.h)
     endif()
     message(FATAL_ERROR "Generation of form files failed: \n${FORM_GENERATION_OUTPUT}")
   endif()
@@ -351,7 +351,7 @@ endif()
 # FIXME: Generate files in Build directory instead?
 # NOTE: We need to call this script after generate-formfiles
 
-if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/CMakeLists.txt)
+if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/poisson/CMakeLists.txt)
   message(STATUS "")
   message(STATUS "Generating CMakeLists.txt files in demo and test directories")
   message(STATUS "-------------------------------------------------------------------")
@@ -365,8 +365,8 @@ if (PYTHONINTERP_FOUND AND NOT EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poiss
   if (CMAKE_GENERATION_RESULT)
 
     # Cleanup so FFC rebuild is triggered next time we run cmake
-    if (EXISTS ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/CMakeLists.txt)
-      file(REMOVE ${DOLFIN_SOURCE_DIR}/demo/documented/poisson/CMakeLists.txt)
+    if (EXISTS ${DOLFIN_SOURCE_DIR}/demo/poisson/CMakeLists.txt)
+      file(REMOVE ${DOLFIN_SOURCE_DIR}/demo/poisson/CMakeLists.txt)
     endif()
     message(FATAL_ERROR "Generation of CMakeLists.txt files failed: \n${CMAKE_GENERATION_OUTPUT}")
   endif()

diff --git a/cpp/cmake/scripts/generate-cmakefiles.py b/cpp/cmake/scripts/generate-cmakefiles.py
@@ -81,7 +81,6 @@
     demo=set(["main.cpp", "main.cpp.rst"]), bench=set(["main.cpp"]))
 
 # Projects that use custom CMakeLists.txt (shouldn't overwrite)
-#exclude_projects = [os.path.join('demo', 'undocumented', 'plot-qt')]
 exclude_projects = []
 
 

diff --git a/cpp/demo/CMakeLists.txt b/cpp/demo/CMakeLists.txt
@@ -7,11 +7,11 @@ find_package(DOLFIN REQUIRED)
 # include(${DOLFIN_USE_FILE})
 
 # Demos that run in real and complex modes
-add_subdirectory(documented/poisson)
+add_subdirectory(poisson)
 
 # Demos that run only in real mode
 if (NOT PETSC_SCALAR_COMPLEX)
-  add_subdirectory(documented/hyperelasticity)
+  add_subdirectory(hyperelasticity)
 endif()
 
 # Demos that run only in complex mode

diff --git a/...d/hyperelasticity/HyperElasticity.ufl.rst → ...o/hyperelasticity/HyperElasticity.ufl.rst b/...d/hyperelasticity/HyperElasticity.ufl.rst → ...o/hyperelasticity/HyperElasticity.ufl.rst
diff --git a/cpp/demo/documented/hyperelasticity/main.cpp → cpp/demo/hyperelasticity/main.cpp b/cpp/demo/documented/hyperelasticity/main.cpp → cpp/demo/hyperelasticity/main.cpp
diff --git a/cpp/demo/documented/poisson/Poisson.ufl.rst → cpp/demo/poisson/Poisson.ufl.rst b/cpp/demo/documented/poisson/Poisson.ufl.rst → cpp/demo/poisson/Poisson.ufl.rst
diff --git a/cpp/demo/documented/poisson/main.cpp.rst → cpp/demo/poisson/main.cpp.rst b/cpp/demo/documented/poisson/main.cpp.rst → cpp/demo/poisson/main.cpp.rst
diff --git a/...d/cahn-hilliard/demo_cahn-hilliard.py.rst → ...o/cahn-hilliard/demo_cahn-hilliard.py.rst b/...d/cahn-hilliard/demo_cahn-hilliard.py.rst → ...o/cahn-hilliard/demo_cahn-hilliard.py.rst
diff --git a/python/demo/documented/dolfin_fine.h5 → python/demo/dolfin_fine.h5 b/python/demo/documented/dolfin_fine.h5 → python/demo/dolfin_fine.h5
diff --git a/python/demo/documented/dolfin_fine.xdmf → python/demo/dolfin_fine.xdmf b/python/demo/documented/dolfin_fine.xdmf → python/demo/dolfin_fine.xdmf
diff --git a/...ndocumented/elasticity/demo_elasticity.py → python/demo/elasticity/demo_elasticity.py b/...ndocumented/elasticity/demo_elasticity.py → python/demo/elasticity/demo_elasticity.py
diff --git a/.../helmholtz2D/demo_helmholtz_plane_wave.py → .../helmholtz2D/demo_helmholtz_plane_wave.py b/.../helmholtz2D/demo_helmholtz_plane_wave.py → .../helmholtz2D/demo_helmholtz_plane_wave.py
diff --git a/...mo/documented/poisson/demo_poisson.py.rst → python/demo/poisson/demo_poisson.py.rst b/...mo/documented/poisson/demo_poisson.py.rst → python/demo/poisson/demo_poisson.py.rst
diff --git a/python/demo/documented/poisson/poisson_u.png → python/demo/poisson/poisson_u.png b/python/demo/documented/poisson/poisson_u.png → python/demo/poisson/poisson_u.png
diff --git a/...aylor-hood/demo_stokes-taylor-hood.py.rst → ...aylor-hood/demo_stokes-taylor-hood.py.rst b/...aylor-hood/demo_stokes-taylor-hood.py.rst → ...aylor-hood/demo_stokes-taylor-hood.py.rst
diff --git a/python/demo/test.py b/python/demo/test.py
@@ -13,15 +13,13 @@
 import pytest
 
 # Get directory of this file
-dir_path = pathlib.Path(__file__).resolve().parent
+path = pathlib.Path(__file__).resolve().parent
 
 # Build list of demo programs
 demos = []
-for subdir in ['documented', 'undocumented']:
-    p = pathlib.Path(dir_path, subdir)
-    demo_files = list(p.glob('**/*.py'))
-    for f in demo_files:
-        demos.append((f.parent, f.name))
+demo_files = list(path.glob('**/*.py'))
+for f in demo_files:
+    demos.append((f.parent, f.name))
 
 
 @pytest.mark.serial

diff --git a/python/doc/source/conf.py b/python/doc/source/conf.py
@@ -12,7 +12,7 @@
 import sys
 import shutil
 shutil.rmtree("demos", True)
-shutil.copytree("../../demo/documented", "demos")
+shutil.copytree("../../demo", "demos")
 
 #import rstprocess
 #rstprocess.process()

diff --git a/python/doc/source/rstprocess.py b/python/doc/source/rstprocess.py
@@ -30,7 +30,7 @@ def process():
         raise RuntimeError("Cannot find pylit.py")
 
     # Directories to scan
-    subdirs = ["../../demo/documented"]
+    subdirs = ["../../demo"]
 
     # Iterate over subdirectories containing demos
     for subdir in subdirs: