Merge pull request #330 from hannesbrandt/feature-demo

Move swirl_rays and filament_swirl to demos

applications/clawpack/clawpack.apps

@@ -28,9 +28,6 @@ include applications/clawpack/advection/2d/disk/Makefile.am
 ## filament  (square, multi-block disk)
 include applications/clawpack/advection/2d/filament/Makefile.am
 
-## filament_swirl
-include applications/clawpack/advection/2d/filament_swirl/Makefile.am
-
 ## hemisphere (manifold, multi-block)
 include applications/clawpack/advection/2d/hemisphere/Makefile.am
 
@@ -49,9 +46,6 @@ include applications/clawpack/advection/2d/sphere/Makefile.am
 ## swirl  (single block, square)
 include applications/clawpack/advection/2d/swirl/Makefile.am
 
-## swirl_rays (single block, square)
-include applications/clawpack/advection/2d/swirl_rays/Makefile.am
-
 ## torus  (manifold, periodic in both directions)
 include applications/clawpack/advection/2d/torus/Makefile.am
 

applications/clawpack/clawpack.cmake

@@ -23,9 +23,6 @@ add_subdirectory(clawpack/advection/2d/swirl)
 ## filament  (square, multi-block disk)
 add_subdirectory(clawpack/advection/2d/filament)
 
-## filament_swirl
-add_subdirectory(clawpack/advection/2d/filament_swirl)
-
 ## annulus  (manifold, periodic in one direction)
 add_subdirectory(clawpack/advection/2d/annulus)
 
@@ -80,12 +77,6 @@ add_subdirectory(clawpack/transport/2d/sphere)
 add_subdirectory(clawpack/transport/2d/torus)
 add_subdirectory(clawpack/transport/2d/square)
 
-## -------------------------------- Rays --------------------------------- 
-## Test example including rays
-## -------------------------------------------------------------------------
-
-add_subdirectory(clawpack/advection/2d/swirl_rays)
-
 ## ----------------------------------------------------------
 ## Other hyperbolic problems (acoustics, Euler, burgers, SWE)
 ## ----------------------------------------------------------

applications/clawpack/advection/2d/filament_swirl/CMakeLists.txt → applications/demo/2d/filament_swirl/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(all ${PROJECT_SOURCE_DIR}/clawpack/advection/2d/all)
+set(all ${PROJECT_SOURCE_DIR}/demo/2d/all)
 
 add_library(filament_swirl_f OBJECT 
   psi.f 
@@ -84,5 +84,5 @@ target_link_libraries(filament_swirl_split PRIVATE
  FORESTCLAW::CLAWPACK5
 )
 
-add_test(NAME clawpack_advection_2d_filament_swirl COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/regressions.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_tests_properties(clawpack_advection_2d_filament_swirl PROPERTIES ENVIRONMENT "${FCLAW_TEST_ENVIRONMENT}")
+add_test(NAME demo_2d_filament_swirl COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/regressions.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_tests_properties(demo_2d_filament_swirl PROPERTIES ENVIRONMENT "${FCLAW_TEST_ENVIRONMENT}")