feature-demo: move swirl_rays to demo

applications/clawpack/clawpack.apps

@@ -49,9 +49,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

@@ -80,12 +80,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/swirl_rays/CMakeLists.txt → applications/demo/2d/swirl_rays/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(swirl_rays_f OBJECT 
   psi.f 
@@ -34,6 +34,3 @@ target_link_libraries(swirl_rays PRIVATE
  FORESTCLAW::CLAWPACK4.6
  FORESTCLAW::CLAWPACK5
 )
-
-add_test(NAME clawpack_advection_2d_swirl_rays COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/regressions.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_tests_properties(clawpack_advection_2d_swirl_rays PROPERTIES ENVIRONMENT "${FCLAW_TEST_ENVIRONMENT}")

applications/demo/2d/swirl_rays/Makefile.am

@@ -0,0 +1,46 @@
+## Makefile.am in applications/demo/2d/swirl_rays
+
+bin_PROGRAMS += applications/demo/2d/swirl_rays/swirl
+
+applications_demo_2d_swirl_rays_swirl_SOURCES = \
+	applications/demo/2d/swirl_rays/swirl_user.cpp \
+	applications/demo/2d/swirl_rays/swirl_user.h \
+	applications/demo/2d/swirl_rays/swirl_options.c \
+	applications/demo/2d/swirl_rays/swirl.cpp \
+	applications/demo/2d/swirl_rays/psi.f \
+	applications/demo/2d/swirl_rays/setprob.f \
+	applications/demo/2d/all/clawpack46_setaux.f \
+	applications/demo/2d/all/clawpack5_setaux.f90 \
+	applications/demo/2d/all/clawpack46_rpn2adv.f \
+	applications/demo/2d/all/clawpack46_rpt2adv.f \
+	applications/demo/2d/all/clawpack5_rpn2adv.f90 \
+	applications/demo/2d/all/clawpack5_rpt2adv.f90 \
+	applications/demo/2d/swirl_rays/user_4.6/qinit.f \
+	applications/demo/2d/swirl_rays/user_4.6/b4step2.f \
+	applications/demo/2d/swirl_rays/user_5.0/qinit.f90 \
+	applications/demo/2d/swirl_rays/user_5.0/b4step2.f90
+
+EXTRA_DIST += \
+	applications/demo/2d/swirl_rays/fclaw_options.ini \
+	applications/demo/2d/swirl_rays/regression.ini \
+	applications/demo/2d/swirl_rays/afterframe.m \
+	applications/demo/2d/swirl_rays/setplot2.m \
+	applications/demo/2d/swirl_rays/swirl.ipynb \
+	applications/demo/2d/swirl_rays/make_plots.py
+
+## Include headers and libraries needed to build this application
+##  -- Only really need AM_CPPFLAGS and LDADD (since these include all the other 
+##     variables).  But others are included here for completeness
+applications_demo_2d_swirl_rays_swirl_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        $(FCLAW_CLAWPACK46_CPPFLAGS) \
+        $(FCLAW_CLAWPACK5_CPPFLAGS) \
+        $(FCLAW_CLAWPATCH_CPPFLAGS)
+
+
+applications_demo_2d_swirl_rays_swirl_LDADD = \
+        $(LDADD) \
+        $(FCLAW_CLAWPACK46_LDADD) \
+        $(FCLAW_CLAWPACK5_LDADD) \
+        $(FCLAW_CLAWPATCH_LDADD) \
+        $(FCLAW_LDADD)

applications/clawpack/advection/2d/swirl_rays/regressions.sh → applications/demo/2d/swirl_rays/regressions.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 # absolute path to application we are testing
-application=$FCLAW_APPLICATIONS_BUILD_DIR/clawpack/advection/2d/swirl/swirl
+application=$FCLAW_APPLICATIONS_BUILD_DIR/demo/2d/swirl_rays/swirl
 
 # change to source dir for working directory
-cd $FCLAW_APPLICATIONS_SRC_DIR/clawpack/advection/2d/swirl/
+cd $FCLAW_APPLICATIONS_SRC_DIR/demo/2d/swirl_rays/
 
 # run programs, exit script with nonzero on failure (or else script will exit with value of last program run)
 $FCLAW_MPIRUN $FCLAW_MPI_TEST_FLAGS $application -F regression.ini --user:claw-version=4  --regression-check=regression_values_0.csv || exit 1

applications/demo/demo.apps

@@ -6,3 +6,6 @@
 
 ## swirl restart demonstration
 include applications/demo/2d/swirl_restart/Makefile.am
+
+## swirl ray integration demonstration
+include applications/demo/2d/swirl_rays/Makefile.am

applications/demo/demo.cmake

@@ -6,3 +6,6 @@
 
 ## swirl restart demonstration
 add_subdirectory(demo/2d/swirl_restart)
+
+## swirl ray integration demonstration
+add_subdirectory(demo/2d/swirl_rays)