From ed2312fb1ab8b8bc72ee5c3e5f94a6d45fe04361 Mon Sep 17 00:00:00 2001 From: Hannes Brandt Date: Fri, 12 Apr 2024 13:32:45 +0200 Subject: [PATCH 1/3] feature-demo: move swirl_rays to demo --- .../advection/2d/swirl_rays/Makefile.am | 48 ------------------- applications/clawpack/clawpack.apps | 3 -- applications/clawpack/clawpack.cmake | 6 --- .../2d/swirl_rays/CMakeLists.txt | 5 +- applications/demo/2d/swirl_rays/Makefile.am | 46 ++++++++++++++++++ .../2d/swirl_rays/afterframe.m | 0 .../2d/swirl_rays/fclaw_options.ini | 0 .../advection => demo}/2d/swirl_rays/psi.f | 0 .../2d/swirl_rays/regression.ini | 0 .../2d/swirl_rays/regressions.sh | 4 +- .../2d/swirl_rays/setplot2.m | 0 .../2d/swirl_rays/setprob.f | 0 .../2d/swirl_rays/swirl.cpp | 0 .../2d/swirl_rays/swirl_options.c | 0 .../2d/swirl_rays/swirl_user.cpp | 0 .../2d/swirl_rays/swirl_user.h | 0 .../2d/swirl_rays/user_4.6/b4step2.f | 0 .../2d/swirl_rays/user_4.6/qinit.f | 0 .../2d/swirl_rays/user_5.0/b4step2.f90 | 0 .../2d/swirl_rays/user_5.0/qinit.f90 | 0 applications/demo/demo.apps | 3 ++ applications/demo/demo.cmake | 3 ++ 22 files changed, 55 insertions(+), 63 deletions(-) delete mode 100644 applications/clawpack/advection/2d/swirl_rays/Makefile.am rename applications/{clawpack/advection => demo}/2d/swirl_rays/CMakeLists.txt (69%) create mode 100644 applications/demo/2d/swirl_rays/Makefile.am rename applications/{clawpack/advection => demo}/2d/swirl_rays/afterframe.m (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/fclaw_options.ini (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/psi.f (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/regression.ini (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/regressions.sh (78%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/setplot2.m (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/setprob.f (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/swirl.cpp (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/swirl_options.c (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/swirl_user.cpp (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/swirl_user.h (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/user_4.6/b4step2.f (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/user_4.6/qinit.f (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/user_5.0/b4step2.f90 (100%) rename applications/{clawpack/advection => demo}/2d/swirl_rays/user_5.0/qinit.f90 (100%) diff --git a/applications/clawpack/advection/2d/swirl_rays/Makefile.am b/applications/clawpack/advection/2d/swirl_rays/Makefile.am deleted file mode 100644 index af5e42b71..000000000 --- a/applications/clawpack/advection/2d/swirl_rays/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Makefile.am in applications/clawpack/advection/2d/swirl_rays - -bin_PROGRAMS += applications/clawpack/advection/2d/swirl_rays/swirl - -TESTS += applications/clawpack/advection/2d/swirl_rays/regressions.sh - -applications_clawpack_advection_2d_swirl_rays_swirl_SOURCES = \ - applications/clawpack/advection/2d/swirl_rays/swirl_user.cpp \ - applications/clawpack/advection/2d/swirl_rays/swirl_user.h \ - applications/clawpack/advection/2d/swirl_rays/swirl_options.c \ - applications/clawpack/advection/2d/swirl_rays/swirl.cpp \ - applications/clawpack/advection/2d/swirl_rays/psi.f \ - applications/clawpack/advection/2d/swirl_rays/setprob.f \ - applications/clawpack/advection/2d/all/clawpack46_setaux.f \ - applications/clawpack/advection/2d/all/clawpack5_setaux.f90 \ - applications/clawpack/advection/2d/all/clawpack46_rpn2adv.f \ - applications/clawpack/advection/2d/all/clawpack46_rpt2adv.f \ - applications/clawpack/advection/2d/all/clawpack5_rpn2adv.f90 \ - applications/clawpack/advection/2d/all/clawpack5_rpt2adv.f90 \ - applications/clawpack/advection/2d/swirl_rays/user_4.6/qinit.f \ - applications/clawpack/advection/2d/swirl_rays/user_4.6/b4step2.f \ - applications/clawpack/advection/2d/swirl_rays/user_5.0/qinit.f90 \ - applications/clawpack/advection/2d/swirl_rays/user_5.0/b4step2.f90 - -EXTRA_DIST += \ - applications/clawpack/advection/2d/swirl_rays/fclaw_options.ini \ - applications/clawpack/advection/2d/swirl_rays/regression.ini \ - applications/clawpack/advection/2d/swirl_rays/afterframe.m \ - applications/clawpack/advection/2d/swirl_rays/setplot2.m \ - applications/clawpack/advection/2d/swirl_rays/swirl.ipynb \ - applications/clawpack/advection/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_clawpack_advection_2d_swirl_rays_swirl_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(FCLAW_CLAWPACK46_CPPFLAGS) \ - $(FCLAW_CLAWPACK5_CPPFLAGS) \ - $(FCLAW_CLAWPATCH_CPPFLAGS) - - -applications_clawpack_advection_2d_swirl_rays_swirl_LDADD = \ - $(LDADD) \ - $(FCLAW_CLAWPACK46_LDADD) \ - $(FCLAW_CLAWPACK5_LDADD) \ - $(FCLAW_CLAWPATCH_LDADD) \ - $(FCLAW_LDADD) diff --git a/applications/clawpack/clawpack.apps b/applications/clawpack/clawpack.apps index 4e650259a..81ca8fb15 100644 --- a/applications/clawpack/clawpack.apps +++ b/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 diff --git a/applications/clawpack/clawpack.cmake b/applications/clawpack/clawpack.cmake index 6bcf9add8..408700fd6 100644 --- a/applications/clawpack/clawpack.cmake +++ b/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) ## ---------------------------------------------------------- diff --git a/applications/clawpack/advection/2d/swirl_rays/CMakeLists.txt b/applications/demo/2d/swirl_rays/CMakeLists.txt similarity index 69% rename from applications/clawpack/advection/2d/swirl_rays/CMakeLists.txt rename to applications/demo/2d/swirl_rays/CMakeLists.txt index 8e876aa67..ad9c3bf80 100644 --- a/applications/clawpack/advection/2d/swirl_rays/CMakeLists.txt +++ b/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}") \ No newline at end of file diff --git a/applications/demo/2d/swirl_rays/Makefile.am b/applications/demo/2d/swirl_rays/Makefile.am new file mode 100644 index 000000000..91bc89bfd --- /dev/null +++ b/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) diff --git a/applications/clawpack/advection/2d/swirl_rays/afterframe.m b/applications/demo/2d/swirl_rays/afterframe.m similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/afterframe.m rename to applications/demo/2d/swirl_rays/afterframe.m diff --git a/applications/clawpack/advection/2d/swirl_rays/fclaw_options.ini b/applications/demo/2d/swirl_rays/fclaw_options.ini similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/fclaw_options.ini rename to applications/demo/2d/swirl_rays/fclaw_options.ini diff --git a/applications/clawpack/advection/2d/swirl_rays/psi.f b/applications/demo/2d/swirl_rays/psi.f similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/psi.f rename to applications/demo/2d/swirl_rays/psi.f diff --git a/applications/clawpack/advection/2d/swirl_rays/regression.ini b/applications/demo/2d/swirl_rays/regression.ini similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/regression.ini rename to applications/demo/2d/swirl_rays/regression.ini diff --git a/applications/clawpack/advection/2d/swirl_rays/regressions.sh b/applications/demo/2d/swirl_rays/regressions.sh similarity index 78% rename from applications/clawpack/advection/2d/swirl_rays/regressions.sh rename to applications/demo/2d/swirl_rays/regressions.sh index aac4ffb1c..d1d9a651f 100755 --- a/applications/clawpack/advection/2d/swirl_rays/regressions.sh +++ b/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 diff --git a/applications/clawpack/advection/2d/swirl_rays/setplot2.m b/applications/demo/2d/swirl_rays/setplot2.m similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/setplot2.m rename to applications/demo/2d/swirl_rays/setplot2.m diff --git a/applications/clawpack/advection/2d/swirl_rays/setprob.f b/applications/demo/2d/swirl_rays/setprob.f similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/setprob.f rename to applications/demo/2d/swirl_rays/setprob.f diff --git a/applications/clawpack/advection/2d/swirl_rays/swirl.cpp b/applications/demo/2d/swirl_rays/swirl.cpp similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/swirl.cpp rename to applications/demo/2d/swirl_rays/swirl.cpp diff --git a/applications/clawpack/advection/2d/swirl_rays/swirl_options.c b/applications/demo/2d/swirl_rays/swirl_options.c similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/swirl_options.c rename to applications/demo/2d/swirl_rays/swirl_options.c diff --git a/applications/clawpack/advection/2d/swirl_rays/swirl_user.cpp b/applications/demo/2d/swirl_rays/swirl_user.cpp similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/swirl_user.cpp rename to applications/demo/2d/swirl_rays/swirl_user.cpp diff --git a/applications/clawpack/advection/2d/swirl_rays/swirl_user.h b/applications/demo/2d/swirl_rays/swirl_user.h similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/swirl_user.h rename to applications/demo/2d/swirl_rays/swirl_user.h diff --git a/applications/clawpack/advection/2d/swirl_rays/user_4.6/b4step2.f b/applications/demo/2d/swirl_rays/user_4.6/b4step2.f similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/user_4.6/b4step2.f rename to applications/demo/2d/swirl_rays/user_4.6/b4step2.f diff --git a/applications/clawpack/advection/2d/swirl_rays/user_4.6/qinit.f b/applications/demo/2d/swirl_rays/user_4.6/qinit.f similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/user_4.6/qinit.f rename to applications/demo/2d/swirl_rays/user_4.6/qinit.f diff --git a/applications/clawpack/advection/2d/swirl_rays/user_5.0/b4step2.f90 b/applications/demo/2d/swirl_rays/user_5.0/b4step2.f90 similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/user_5.0/b4step2.f90 rename to applications/demo/2d/swirl_rays/user_5.0/b4step2.f90 diff --git a/applications/clawpack/advection/2d/swirl_rays/user_5.0/qinit.f90 b/applications/demo/2d/swirl_rays/user_5.0/qinit.f90 similarity index 100% rename from applications/clawpack/advection/2d/swirl_rays/user_5.0/qinit.f90 rename to applications/demo/2d/swirl_rays/user_5.0/qinit.f90 diff --git a/applications/demo/demo.apps b/applications/demo/demo.apps index 4b68b626e..e98d4284d 100644 --- a/applications/demo/demo.apps +++ b/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 \ No newline at end of file diff --git a/applications/demo/demo.cmake b/applications/demo/demo.cmake index 7db727414..e85ecded9 100644 --- a/applications/demo/demo.cmake +++ b/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) \ No newline at end of file From b33be0679b53e796d2d6dd19f5dce86aab9251e7 Mon Sep 17 00:00:00 2001 From: Hannes Brandt Date: Fri, 12 Apr 2024 13:58:22 +0200 Subject: [PATCH 2/3] feature-demo: remove regression files in demos --- .../demo/2d/swirl_rays/regression.ini | 112 ------------------ .../demo/2d/swirl_rays/regressions.sh | 10 -- .../demo/2d/swirl_restart/regression.ini | 112 ------------------ .../2d/swirl_restart/regression_values_0.csv | 3 - .../2d/swirl_restart/regression_values_1.csv | 3 - .../demo/2d/swirl_restart/regressions.sh | 10 -- 6 files changed, 250 deletions(-) delete mode 100644 applications/demo/2d/swirl_rays/regression.ini delete mode 100755 applications/demo/2d/swirl_rays/regressions.sh delete mode 100644 applications/demo/2d/swirl_restart/regression.ini delete mode 100644 applications/demo/2d/swirl_restart/regression_values_0.csv delete mode 100644 applications/demo/2d/swirl_restart/regression_values_1.csv delete mode 100755 applications/demo/2d/swirl_restart/regressions.sh diff --git a/applications/demo/2d/swirl_rays/regression.ini b/applications/demo/2d/swirl_rays/regression.ini deleted file mode 100644 index 12f4d9dba..000000000 --- a/applications/demo/2d/swirl_rays/regression.ini +++ /dev/null @@ -1,112 +0,0 @@ -[user] - period = 4.0 - claw-version = 4 - - -[clawpatch] - # Grid dimensions - mx = 8 # mx_leaf - my = 8 # my_leaf - mbc = 2 # Number of ghost cells - maux = 3 - - # Equations and boundary conditions - meqn = 1 # Number of equations - -[Options] - # --------------------------- - # Dynamic gridding parameters - # --------------------------- - - minlevel = 2 # Minimum level - maxlevel = 6 # Maximum levels of refinement - - regrid_interval = 1 # Regrid every 'regrid_interval' time steps. - refine_threshold = 0.25 - coarsen_threshold = 0.05 - - smooth-refine = T - refine-level = 6 - - # -------------- - # Time stepping - # -------------- - tfinal = 0.1 # Final time - - use_fixed_dt = F # Take a fixed time step - initial_dt = 0.005 # Initial time step for 'minlevel' - max_cfl = 1.0 # maximum cfl - desired_cfl = 0.9 # desired cfl - - outstyle = 1 # OutputStyle = 1,2,3 - - nout = 1 # Used for all three out styles; has different meaning, though. - nstep = 1 # Only used if outstyle is 3 - - subcycle = T # subcycle in time ( = T or F). - - # ------------------- - # File and console IO - # ------------------- - verbosity = production - output = F - - # ----------- - # Tikz output - # ----------- - tikz-out = F - tikz-figsize = 4 4 - tikz-plot-prefix = 'plot' - tikz-plot-suffix = 'png' - - # ------------------------- - # Diagnostics and debugging - # ------------------------- - trapfpe = T # Trap floating point errors. - mpi_debug = F # Attach mpi processes in gdb - conservation-check = F - run-user-diagnostics = F - compute-error = F - report-timing=T - report-timing-verbosity=wall - - # ------- - # Mapping - # ------- - manifold = F # Manifold - - # Domain dimensions - used only if manifold = F - ax = 0 - bx = 1 - ay = 0 - by = 1 - - -[clawpack46] - order = 2 2 # normal and transverse order - mcapa = 0 # mcapa - src_term = 0 # src_term - - mwaves = 1 # mwaves - mthlim = 3 # mthlim (is a vector in general, with 'mwaves' entries) - mthbc = 1 1 1 1 # mthbc (=left,right,bottom,top) - - # output - ascii-out = T - vtk-out = F - - -[clawpack5] - order = 2 2 # normal and transverse order - mcapa = 0 # mcapa - src_term = 0 # src_term - - mwaves = 1 # mwaves - mthlim = 3 # mthlim (is a vector in general, with 'mwaves' entries) - mthbc = 1 1 1 1 # mthbc (=left,right,bottom,top) - - # output - ascii-out = T - vtk-out = F - - diff --git a/applications/demo/2d/swirl_rays/regressions.sh b/applications/demo/2d/swirl_rays/regressions.sh deleted file mode 100755 index d1d9a651f..000000000 --- a/applications/demo/2d/swirl_rays/regressions.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# absolute path to application we are testing -application=$FCLAW_APPLICATIONS_BUILD_DIR/demo/2d/swirl_rays/swirl - -# change to source dir for working directory -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 -$FCLAW_MPIRUN $FCLAW_MPI_TEST_FLAGS $application -F regression.ini --user:claw-version=5 --regression-check=regression_values_1.csv || exit 1 diff --git a/applications/demo/2d/swirl_restart/regression.ini b/applications/demo/2d/swirl_restart/regression.ini deleted file mode 100644 index 12f4d9dba..000000000 --- a/applications/demo/2d/swirl_restart/regression.ini +++ /dev/null @@ -1,112 +0,0 @@ -[user] - period = 4.0 - claw-version = 4 - - -[clawpatch] - # Grid dimensions - mx = 8 # mx_leaf - my = 8 # my_leaf - mbc = 2 # Number of ghost cells - maux = 3 - - # Equations and boundary conditions - meqn = 1 # Number of equations - -[Options] - # --------------------------- - # Dynamic gridding parameters - # --------------------------- - - minlevel = 2 # Minimum level - maxlevel = 6 # Maximum levels of refinement - - regrid_interval = 1 # Regrid every 'regrid_interval' time steps. - refine_threshold = 0.25 - coarsen_threshold = 0.05 - - smooth-refine = T - refine-level = 6 - - # -------------- - # Time stepping - # -------------- - tfinal = 0.1 # Final time - - use_fixed_dt = F # Take a fixed time step - initial_dt = 0.005 # Initial time step for 'minlevel' - max_cfl = 1.0 # maximum cfl - desired_cfl = 0.9 # desired cfl - - outstyle = 1 # OutputStyle = 1,2,3 - - nout = 1 # Used for all three out styles; has different meaning, though. - nstep = 1 # Only used if outstyle is 3 - - subcycle = T # subcycle in time ( = T or F). - - # ------------------- - # File and console IO - # ------------------- - verbosity = production - output = F - - # ----------- - # Tikz output - # ----------- - tikz-out = F - tikz-figsize = 4 4 - tikz-plot-prefix = 'plot' - tikz-plot-suffix = 'png' - - # ------------------------- - # Diagnostics and debugging - # ------------------------- - trapfpe = T # Trap floating point errors. - mpi_debug = F # Attach mpi processes in gdb - conservation-check = F - run-user-diagnostics = F - compute-error = F - report-timing=T - report-timing-verbosity=wall - - # ------- - # Mapping - # ------- - manifold = F # Manifold - - # Domain dimensions - used only if manifold = F - ax = 0 - bx = 1 - ay = 0 - by = 1 - - -[clawpack46] - order = 2 2 # normal and transverse order - mcapa = 0 # mcapa - src_term = 0 # src_term - - mwaves = 1 # mwaves - mthlim = 3 # mthlim (is a vector in general, with 'mwaves' entries) - mthbc = 1 1 1 1 # mthbc (=left,right,bottom,top) - - # output - ascii-out = T - vtk-out = F - - -[clawpack5] - order = 2 2 # normal and transverse order - mcapa = 0 # mcapa - src_term = 0 # src_term - - mwaves = 1 # mwaves - mthlim = 3 # mthlim (is a vector in general, with 'mwaves' entries) - mthbc = 1 1 1 1 # mthbc (=left,right,bottom,top) - - # output - ascii-out = T - vtk-out = F - - diff --git a/applications/demo/2d/swirl_restart/regression_values_0.csv b/applications/demo/2d/swirl_restart/regression_values_0.csv deleted file mode 100644 index a13777f27..000000000 --- a/applications/demo/2d/swirl_restart/regression_values_0.csv +++ /dev/null @@ -1,3 +0,0 @@ -count_amr_advance,5 -global_num_patches,916 -count_amr_new_domain,5 diff --git a/applications/demo/2d/swirl_restart/regression_values_1.csv b/applications/demo/2d/swirl_restart/regression_values_1.csv deleted file mode 100644 index a13777f27..000000000 --- a/applications/demo/2d/swirl_restart/regression_values_1.csv +++ /dev/null @@ -1,3 +0,0 @@ -count_amr_advance,5 -global_num_patches,916 -count_amr_new_domain,5 diff --git a/applications/demo/2d/swirl_restart/regressions.sh b/applications/demo/2d/swirl_restart/regressions.sh deleted file mode 100755 index aac4ffb1c..000000000 --- a/applications/demo/2d/swirl_restart/regressions.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# absolute path to application we are testing -application=$FCLAW_APPLICATIONS_BUILD_DIR/clawpack/advection/2d/swirl/swirl - -# change to source dir for working directory -cd $FCLAW_APPLICATIONS_SRC_DIR/clawpack/advection/2d/swirl/ - -# 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 -$FCLAW_MPIRUN $FCLAW_MPI_TEST_FLAGS $application -F regression.ini --user:claw-version=5 --regression-check=regression_values_1.csv || exit 1 From c2e6dd330e79cbbfded16e1f2abc19a25876d236 Mon Sep 17 00:00:00 2001 From: Hannes Brandt Date: Fri, 12 Apr 2024 14:25:12 +0200 Subject: [PATCH 3/3] feature-demo: move filament_swirl to demo --- .../advection/2d/filament_swirl/Makefile.am | 92 ------------------- applications/clawpack/clawpack.apps | 3 - applications/clawpack/clawpack.cmake | 3 - .../2d/filament_swirl/CMakeLists.txt | 6 +- .../demo/2d/filament_swirl/Makefile.am | 92 +++++++++++++++++++ .../create_filament_soln_tikz.m | 0 .../2d/filament_swirl/filament.cpp | 0 .../2d/filament_swirl/filament/afterframe.m | 0 .../2d/filament_swirl/filament/fdisc.f | 0 .../filament_swirl/filament/filament_fort.h | 0 .../filament/filament_options.c | 0 .../filament/filament_regression_values_0.csv | 0 .../filament_swirl/filament/filament_user.cpp | 0 .../filament_swirl/filament/filament_user.h | 0 .../2d/filament_swirl/filament/psi.f | 0 .../2d/filament_swirl/filament/setprob.f | 0 .../filament_swirl/filament/user_4.6/qinit.f | 0 .../filament/user_5.0/qinit.f90 | 0 .../2d/filament_swirl/filament_options.ini | 0 .../2d/filament_swirl/filament_swirl.cpp | 0 .../filament_swirl/filament_swirl_split.cpp | 0 .../2d/filament_swirl/overlap.c | 0 .../2d/filament_swirl/overlap.h | 0 .../2d/filament_swirl/psi.f | 0 .../2d/filament_swirl/regression.ini | 0 .../2d/filament_swirl/regressions.sh | 4 +- .../2d/filament_swirl/swirl.cpp | 0 .../2d/filament_swirl/swirl/psi.f | 0 .../2d/filament_swirl/swirl/setprob.f | 0 .../2d/filament_swirl/swirl/swirl_fort.h | 0 .../2d/filament_swirl/swirl/swirl_options.c | 0 .../swirl/swirl_regression_values_0.csv | 0 .../2d/filament_swirl/swirl/swirl_user.cpp | 0 .../2d/filament_swirl/swirl/swirl_user.h | 0 .../filament_swirl/swirl/user_4.6/b4step2.f | 0 .../2d/filament_swirl/swirl/user_4.6/qinit.f | 0 .../filament_swirl/swirl/user_5.0/b4step2.f90 | 0 .../filament_swirl/swirl/user_5.0/qinit.f90 | 0 .../2d/filament_swirl/swirl_options.ini | 0 .../2d/filament_swirl/user.h | 0 .../2d/filament_swirl/user_run.c | 0 applications/demo/demo.apps | 5 +- applications/demo/demo.cmake | 5 +- 43 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 applications/clawpack/advection/2d/filament_swirl/Makefile.am rename applications/{clawpack/advection => demo}/2d/filament_swirl/CMakeLists.txt (86%) create mode 100644 applications/demo/2d/filament_swirl/Makefile.am rename applications/{clawpack/advection => demo}/2d/filament_swirl/create_filament_soln_tikz.m (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/afterframe.m (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/fdisc.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/filament_fort.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/filament_options.c (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/filament_regression_values_0.csv (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/filament_user.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/filament_user.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/psi.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/setprob.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/user_4.6/qinit.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament/user_5.0/qinit.f90 (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament_options.ini (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament_swirl.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/filament_swirl_split.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/overlap.c (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/overlap.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/psi.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/regression.ini (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/regressions.sh (75%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/psi.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/setprob.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/swirl_fort.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/swirl_options.c (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/swirl_regression_values_0.csv (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/swirl_user.cpp (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/swirl_user.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/user_4.6/b4step2.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/user_4.6/qinit.f (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/user_5.0/b4step2.f90 (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl/user_5.0/qinit.f90 (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/swirl_options.ini (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/user.h (100%) rename applications/{clawpack/advection => demo}/2d/filament_swirl/user_run.c (100%) diff --git a/applications/clawpack/advection/2d/filament_swirl/Makefile.am b/applications/clawpack/advection/2d/filament_swirl/Makefile.am deleted file mode 100644 index 2ebbb2f40..000000000 --- a/applications/clawpack/advection/2d/filament_swirl/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -## Makefile.am in applications/clawpack/advection/2d/filament_swirl - -bin_PROGRAMS += applications/clawpack/advection/2d/filament_swirl/filament_swirl -bin_PROGRAMS += applications/clawpack/advection/2d/filament_swirl/filament_swirl_split - -TESTS += applications/clawpack/advection/2d/filament_swirl/regressions.sh - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_COMMON_SOURCES = \ - applications/clawpack/advection/2d/filament_swirl/user_run.c \ - applications/clawpack/advection/2d/filament_swirl/overlap.c \ - applications/clawpack/advection/2d/filament_swirl/psi.f \ - applications/clawpack/advection/2d/filament_swirl/filament.cpp \ - applications/clawpack/advection/2d/filament_swirl/filament/filament_options.c \ - applications/clawpack/advection/2d/filament_swirl/filament/filament_user.cpp \ - applications/clawpack/advection/2d/filament_swirl/filament/filament_user.h \ - applications/clawpack/advection/2d/filament_swirl/filament/psi.f \ - applications/clawpack/advection/2d/filament_swirl/filament/fdisc.f \ - applications/clawpack/advection/2d/filament_swirl/filament/setprob.f \ - applications/clawpack/advection/2d/filament_swirl/filament/user_4.6/qinit.f \ - applications/clawpack/advection/2d/filament_swirl/filament/user_5.0/qinit.f90 \ - applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.cpp \ - applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.h \ - applications/clawpack/advection/2d/filament_swirl/swirl/swirl_options.c \ - applications/clawpack/advection/2d/filament_swirl/swirl.cpp \ - applications/clawpack/advection/2d/filament_swirl/swirl/psi.f \ - applications/clawpack/advection/2d/filament_swirl/swirl/setprob.f \ - applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/qinit.f \ - applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/b4step2.f \ - applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/qinit.f90 \ - applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/b4step2.f90 \ - applications/clawpack/advection/2d/all/advection_patch_setup_manifold.c \ - applications/clawpack/advection/2d/all/fclaw2d_map_cart.c \ - applications/clawpack/advection/2d/all/fclaw2d_map_fivepatch.c \ - applications/clawpack/advection/2d/all/fclaw2d_map_bilinear.c \ - applications/clawpack/advection/2d/all/user46_setaux_manifold.f \ - applications/clawpack/advection/2d/all/user5_setaux_manifold.f90 \ - applications/clawpack/advection/2d/all/clawpack46_setaux.f \ - applications/clawpack/advection/2d/all/clawpack46_rpn2adv.f \ - applications/clawpack/advection/2d/all/clawpack46_rpt2adv.f \ - applications/clawpack/advection/2d/all/clawpack46_rpn2adv_manifold.f \ - applications/clawpack/advection/2d/all/clawpack46_rpt2adv_manifold.f \ - applications/clawpack/advection/2d/all/clawpack5_setaux.f90 \ - applications/clawpack/advection/2d/all/clawpack5_rpn2adv.f90 \ - applications/clawpack/advection/2d/all/clawpack5_rpt2adv.f90 \ - applications/clawpack/advection/2d/all/clawpack5_rpn2adv_manifold.f90 \ - applications/clawpack/advection/2d/all/clawpack5_rpt2adv_manifold.f90 - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_SOURCES = \ - applications/clawpack/advection/2d/filament_swirl/filament_swirl.cpp \ - $(applications_clawpack_advection_2d_filament_swirl_filament_swirl_COMMON_SOURCES) - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_split_SOURCES = \ - applications/clawpack/advection/2d/filament_swirl/filament_swirl_split.cpp \ - $(applications_clawpack_advection_2d_filament_swirl_filament_swirl_COMMON_SOURCES) - -EXTRA_DIST += \ - applications/clawpack/advection/2d/filament_swirl/fclaw_options.ini \ - applications/clawpack/advection/2d/filament_swirl/regression.ini \ - applications/clawpack/advection/2d/filament_swirl/filament/afterframe.m \ - applications/clawpack/advection/2d/filament_swirl/filament/setplot2.m \ - applications/clawpack/advection/2d/filament_swirl/filament/mapc2m.m \ - applications/clawpack/advection/2d/filament_swirl/filament/filament_soln.m \ - applications/clawpack/advection/2d/filament_swirl/filament/create_filament_soln_tikz.m \ - applications/clawpack/advection/2d/filament_swirl/filament/filament.ipynb \ - applications/clawpack/advection/2d/filament_swirl/filament/make_plots.py \ - applications/clawpack/advection/2d/filament_swirl/swirl/afterframe.m \ - applications/clawpack/advection/2d/filament_swirl/swirl/setplot2.m \ - applications/clawpack/advection/2d/filament_swirl/swirl/swirl.ipynb \ - applications/clawpack/advection/2d/filament_swirl/swirl/make_plots.py - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(FCLAW_CLAWPACK46_CPPFLAGS) \ - $(FCLAW_CLAWPACK5_CPPFLAGS) \ - $(FCLAW_CLAWPATCH_CPPFLAGS) - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_split_CPPFLAGS = \ - $(applications_clawpack_advection_2d_filament_swirl_filament_swirl_CPPFLAGS) - - -# applications_clawpack_advection_2d_filament_swirl_filament_swirl_CPPFLAGS += -D MPI_DEBUG - - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_LDADD = \ - $(LDADD) \ - $(FCLAW_CLAWPACK46_LDADD) \ - $(FCLAW_CLAWPACK5_LDADD) \ - $(FCLAW_CLAWPATCH_LDADD) \ - $(FCLAW_LDADD) - -applications_clawpack_advection_2d_filament_swirl_filament_swirl_split_LDADD = \ - $(applications_clawpack_advection_2d_filament_swirl_filament_swirl_LDADD) \ No newline at end of file diff --git a/applications/clawpack/clawpack.apps b/applications/clawpack/clawpack.apps index 81ca8fb15..3f92e0af2 100644 --- a/applications/clawpack/clawpack.apps +++ b/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 diff --git a/applications/clawpack/clawpack.cmake b/applications/clawpack/clawpack.cmake index 408700fd6..5fd68943e 100644 --- a/applications/clawpack/clawpack.cmake +++ b/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) diff --git a/applications/clawpack/advection/2d/filament_swirl/CMakeLists.txt b/applications/demo/2d/filament_swirl/CMakeLists.txt similarity index 86% rename from applications/clawpack/advection/2d/filament_swirl/CMakeLists.txt rename to applications/demo/2d/filament_swirl/CMakeLists.txt index 490cf7399..1334fa3ba 100644 --- a/applications/clawpack/advection/2d/filament_swirl/CMakeLists.txt +++ b/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}") \ No newline at end of file +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}") \ No newline at end of file diff --git a/applications/demo/2d/filament_swirl/Makefile.am b/applications/demo/2d/filament_swirl/Makefile.am new file mode 100644 index 000000000..ed3ea3fbf --- /dev/null +++ b/applications/demo/2d/filament_swirl/Makefile.am @@ -0,0 +1,92 @@ +## Makefile.am in applications/demo/2d/filament_swirl + +bin_PROGRAMS += applications/demo/2d/filament_swirl/filament_swirl +bin_PROGRAMS += applications/demo/2d/filament_swirl/filament_swirl_split + +TESTS += applications/demo/2d/filament_swirl/regressions.sh + +applications_demo_2d_filament_swirl_filament_swirl_COMMON_SOURCES = \ + applications/demo/2d/filament_swirl/user_run.c \ + applications/demo/2d/filament_swirl/overlap.c \ + applications/demo/2d/filament_swirl/psi.f \ + applications/demo/2d/filament_swirl/filament.cpp \ + applications/demo/2d/filament_swirl/filament/filament_options.c \ + applications/demo/2d/filament_swirl/filament/filament_user.cpp \ + applications/demo/2d/filament_swirl/filament/filament_user.h \ + applications/demo/2d/filament_swirl/filament/psi.f \ + applications/demo/2d/filament_swirl/filament/fdisc.f \ + applications/demo/2d/filament_swirl/filament/setprob.f \ + applications/demo/2d/filament_swirl/filament/user_4.6/qinit.f \ + applications/demo/2d/filament_swirl/filament/user_5.0/qinit.f90 \ + applications/demo/2d/filament_swirl/swirl/swirl_user.cpp \ + applications/demo/2d/filament_swirl/swirl/swirl_user.h \ + applications/demo/2d/filament_swirl/swirl/swirl_options.c \ + applications/demo/2d/filament_swirl/swirl.cpp \ + applications/demo/2d/filament_swirl/swirl/psi.f \ + applications/demo/2d/filament_swirl/swirl/setprob.f \ + applications/demo/2d/filament_swirl/swirl/user_4.6/qinit.f \ + applications/demo/2d/filament_swirl/swirl/user_4.6/b4step2.f \ + applications/demo/2d/filament_swirl/swirl/user_5.0/qinit.f90 \ + applications/demo/2d/filament_swirl/swirl/user_5.0/b4step2.f90 \ + applications/demo/2d/all/advection_patch_setup_manifold.c \ + applications/demo/2d/all/fclaw2d_map_cart.c \ + applications/demo/2d/all/fclaw2d_map_fivepatch.c \ + applications/demo/2d/all/fclaw2d_map_bilinear.c \ + applications/demo/2d/all/user46_setaux_manifold.f \ + applications/demo/2d/all/user5_setaux_manifold.f90 \ + applications/demo/2d/all/clawpack46_setaux.f \ + applications/demo/2d/all/clawpack46_rpn2adv.f \ + applications/demo/2d/all/clawpack46_rpt2adv.f \ + applications/demo/2d/all/clawpack46_rpn2adv_manifold.f \ + applications/demo/2d/all/clawpack46_rpt2adv_manifold.f \ + applications/demo/2d/all/clawpack5_setaux.f90 \ + applications/demo/2d/all/clawpack5_rpn2adv.f90 \ + applications/demo/2d/all/clawpack5_rpt2adv.f90 \ + applications/demo/2d/all/clawpack5_rpn2adv_manifold.f90 \ + applications/demo/2d/all/clawpack5_rpt2adv_manifold.f90 + +applications_demo_2d_filament_swirl_filament_swirl_SOURCES = \ + applications/demo/2d/filament_swirl/filament_swirl.cpp \ + $(applications_demo_2d_filament_swirl_filament_swirl_COMMON_SOURCES) + +applications_demo_2d_filament_swirl_filament_swirl_split_SOURCES = \ + applications/demo/2d/filament_swirl/filament_swirl_split.cpp \ + $(applications_demo_2d_filament_swirl_filament_swirl_COMMON_SOURCES) + +EXTRA_DIST += \ + applications/demo/2d/filament_swirl/fclaw_options.ini \ + applications/demo/2d/filament_swirl/regression.ini \ + applications/demo/2d/filament_swirl/filament/afterframe.m \ + applications/demo/2d/filament_swirl/filament/setplot2.m \ + applications/demo/2d/filament_swirl/filament/mapc2m.m \ + applications/demo/2d/filament_swirl/filament/filament_soln.m \ + applications/demo/2d/filament_swirl/filament/create_filament_soln_tikz.m \ + applications/demo/2d/filament_swirl/filament/filament.ipynb \ + applications/demo/2d/filament_swirl/filament/make_plots.py \ + applications/demo/2d/filament_swirl/swirl/afterframe.m \ + applications/demo/2d/filament_swirl/swirl/setplot2.m \ + applications/demo/2d/filament_swirl/swirl/swirl.ipynb \ + applications/demo/2d/filament_swirl/swirl/make_plots.py + +applications_demo_2d_filament_swirl_filament_swirl_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(FCLAW_CLAWPACK46_CPPFLAGS) \ + $(FCLAW_CLAWPACK5_CPPFLAGS) \ + $(FCLAW_CLAWPATCH_CPPFLAGS) + +applications_demo_2d_filament_swirl_filament_swirl_split_CPPFLAGS = \ + $(applications_demo_2d_filament_swirl_filament_swirl_CPPFLAGS) + + +# applications_demo_2d_filament_swirl_filament_swirl_CPPFLAGS += -D MPI_DEBUG + + +applications_demo_2d_filament_swirl_filament_swirl_LDADD = \ + $(LDADD) \ + $(FCLAW_CLAWPACK46_LDADD) \ + $(FCLAW_CLAWPACK5_LDADD) \ + $(FCLAW_CLAWPATCH_LDADD) \ + $(FCLAW_LDADD) + +applications_demo_2d_filament_swirl_filament_swirl_split_LDADD = \ + $(applications_demo_2d_filament_swirl_filament_swirl_LDADD) \ No newline at end of file diff --git a/applications/clawpack/advection/2d/filament_swirl/create_filament_soln_tikz.m b/applications/demo/2d/filament_swirl/create_filament_soln_tikz.m similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/create_filament_soln_tikz.m rename to applications/demo/2d/filament_swirl/create_filament_soln_tikz.m diff --git a/applications/clawpack/advection/2d/filament_swirl/filament.cpp b/applications/demo/2d/filament_swirl/filament.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament.cpp rename to applications/demo/2d/filament_swirl/filament.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/afterframe.m b/applications/demo/2d/filament_swirl/filament/afterframe.m similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/afterframe.m rename to applications/demo/2d/filament_swirl/filament/afterframe.m diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/fdisc.f b/applications/demo/2d/filament_swirl/filament/fdisc.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/fdisc.f rename to applications/demo/2d/filament_swirl/filament/fdisc.f diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/filament_fort.h b/applications/demo/2d/filament_swirl/filament/filament_fort.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/filament_fort.h rename to applications/demo/2d/filament_swirl/filament/filament_fort.h diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/filament_options.c b/applications/demo/2d/filament_swirl/filament/filament_options.c similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/filament_options.c rename to applications/demo/2d/filament_swirl/filament/filament_options.c diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/filament_regression_values_0.csv b/applications/demo/2d/filament_swirl/filament/filament_regression_values_0.csv similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/filament_regression_values_0.csv rename to applications/demo/2d/filament_swirl/filament/filament_regression_values_0.csv diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/filament_user.cpp b/applications/demo/2d/filament_swirl/filament/filament_user.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/filament_user.cpp rename to applications/demo/2d/filament_swirl/filament/filament_user.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/filament_user.h b/applications/demo/2d/filament_swirl/filament/filament_user.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/filament_user.h rename to applications/demo/2d/filament_swirl/filament/filament_user.h diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/psi.f b/applications/demo/2d/filament_swirl/filament/psi.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/psi.f rename to applications/demo/2d/filament_swirl/filament/psi.f diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/setprob.f b/applications/demo/2d/filament_swirl/filament/setprob.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/setprob.f rename to applications/demo/2d/filament_swirl/filament/setprob.f diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/user_4.6/qinit.f b/applications/demo/2d/filament_swirl/filament/user_4.6/qinit.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/user_4.6/qinit.f rename to applications/demo/2d/filament_swirl/filament/user_4.6/qinit.f diff --git a/applications/clawpack/advection/2d/filament_swirl/filament/user_5.0/qinit.f90 b/applications/demo/2d/filament_swirl/filament/user_5.0/qinit.f90 similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament/user_5.0/qinit.f90 rename to applications/demo/2d/filament_swirl/filament/user_5.0/qinit.f90 diff --git a/applications/clawpack/advection/2d/filament_swirl/filament_options.ini b/applications/demo/2d/filament_swirl/filament_options.ini similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament_options.ini rename to applications/demo/2d/filament_swirl/filament_options.ini diff --git a/applications/clawpack/advection/2d/filament_swirl/filament_swirl.cpp b/applications/demo/2d/filament_swirl/filament_swirl.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament_swirl.cpp rename to applications/demo/2d/filament_swirl/filament_swirl.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/filament_swirl_split.cpp b/applications/demo/2d/filament_swirl/filament_swirl_split.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/filament_swirl_split.cpp rename to applications/demo/2d/filament_swirl/filament_swirl_split.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/overlap.c b/applications/demo/2d/filament_swirl/overlap.c similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/overlap.c rename to applications/demo/2d/filament_swirl/overlap.c diff --git a/applications/clawpack/advection/2d/filament_swirl/overlap.h b/applications/demo/2d/filament_swirl/overlap.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/overlap.h rename to applications/demo/2d/filament_swirl/overlap.h diff --git a/applications/clawpack/advection/2d/filament_swirl/psi.f b/applications/demo/2d/filament_swirl/psi.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/psi.f rename to applications/demo/2d/filament_swirl/psi.f diff --git a/applications/clawpack/advection/2d/filament_swirl/regression.ini b/applications/demo/2d/filament_swirl/regression.ini similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/regression.ini rename to applications/demo/2d/filament_swirl/regression.ini diff --git a/applications/clawpack/advection/2d/filament_swirl/regressions.sh b/applications/demo/2d/filament_swirl/regressions.sh similarity index 75% rename from applications/clawpack/advection/2d/filament_swirl/regressions.sh rename to applications/demo/2d/filament_swirl/regressions.sh index d897a8698..1c5b5e248 100755 --- a/applications/clawpack/advection/2d/filament_swirl/regressions.sh +++ b/applications/demo/2d/filament_swirl/regressions.sh @@ -1,9 +1,9 @@ #!/bin/sh # absolute path to application we are testing -application=$FCLAW_APPLICATIONS_BUILD_DIR/clawpack/advection/2d/filament_swirl/filament_swirl +application=$FCLAW_APPLICATIONS_BUILD_DIR/demo/2d/filament_swirl/filament_swirl # change to source dir for working directory -cd $FCLAW_APPLICATIONS_SRC_DIR/clawpack/advection/2d/filament_swirl/ +cd $FCLAW_APPLICATIONS_SRC_DIR/demo/2d/filament_swirl/ # 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 --filament-user:claw-version=4 --filament-user:example=1 --swirl-user:claw-version=4 --filament:regression-check=filament_regression_values_0.csv --swirl:regression-check=swirl_regression_values_0.csv || exit 1 diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl.cpp b/applications/demo/2d/filament_swirl/swirl.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl.cpp rename to applications/demo/2d/filament_swirl/swirl.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/psi.f b/applications/demo/2d/filament_swirl/swirl/psi.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/psi.f rename to applications/demo/2d/filament_swirl/swirl/psi.f diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/setprob.f b/applications/demo/2d/filament_swirl/swirl/setprob.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/setprob.f rename to applications/demo/2d/filament_swirl/swirl/setprob.f diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/swirl_fort.h b/applications/demo/2d/filament_swirl/swirl/swirl_fort.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/swirl_fort.h rename to applications/demo/2d/filament_swirl/swirl/swirl_fort.h diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/swirl_options.c b/applications/demo/2d/filament_swirl/swirl/swirl_options.c similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/swirl_options.c rename to applications/demo/2d/filament_swirl/swirl/swirl_options.c diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/swirl_regression_values_0.csv b/applications/demo/2d/filament_swirl/swirl/swirl_regression_values_0.csv similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/swirl_regression_values_0.csv rename to applications/demo/2d/filament_swirl/swirl/swirl_regression_values_0.csv diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.cpp b/applications/demo/2d/filament_swirl/swirl/swirl_user.cpp similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.cpp rename to applications/demo/2d/filament_swirl/swirl/swirl_user.cpp diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.h b/applications/demo/2d/filament_swirl/swirl/swirl_user.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/swirl_user.h rename to applications/demo/2d/filament_swirl/swirl/swirl_user.h diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/b4step2.f b/applications/demo/2d/filament_swirl/swirl/user_4.6/b4step2.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/b4step2.f rename to applications/demo/2d/filament_swirl/swirl/user_4.6/b4step2.f diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/qinit.f b/applications/demo/2d/filament_swirl/swirl/user_4.6/qinit.f similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/user_4.6/qinit.f rename to applications/demo/2d/filament_swirl/swirl/user_4.6/qinit.f diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/b4step2.f90 b/applications/demo/2d/filament_swirl/swirl/user_5.0/b4step2.f90 similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/b4step2.f90 rename to applications/demo/2d/filament_swirl/swirl/user_5.0/b4step2.f90 diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/qinit.f90 b/applications/demo/2d/filament_swirl/swirl/user_5.0/qinit.f90 similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl/user_5.0/qinit.f90 rename to applications/demo/2d/filament_swirl/swirl/user_5.0/qinit.f90 diff --git a/applications/clawpack/advection/2d/filament_swirl/swirl_options.ini b/applications/demo/2d/filament_swirl/swirl_options.ini similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/swirl_options.ini rename to applications/demo/2d/filament_swirl/swirl_options.ini diff --git a/applications/clawpack/advection/2d/filament_swirl/user.h b/applications/demo/2d/filament_swirl/user.h similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/user.h rename to applications/demo/2d/filament_swirl/user.h diff --git a/applications/clawpack/advection/2d/filament_swirl/user_run.c b/applications/demo/2d/filament_swirl/user_run.c similarity index 100% rename from applications/clawpack/advection/2d/filament_swirl/user_run.c rename to applications/demo/2d/filament_swirl/user_run.c diff --git a/applications/demo/demo.apps b/applications/demo/demo.apps index e98d4284d..51f69bbe9 100644 --- a/applications/demo/demo.apps +++ b/applications/demo/demo.apps @@ -8,4 +8,7 @@ include applications/demo/2d/swirl_restart/Makefile.am ## swirl ray integration demonstration -include applications/demo/2d/swirl_rays/Makefile.am \ No newline at end of file +include applications/demo/2d/swirl_rays/Makefile.am + +## filament and swirl multisolver with exchange demonstration +include applications/demo/2d/filament_swirl/Makefile.am \ No newline at end of file diff --git a/applications/demo/demo.cmake b/applications/demo/demo.cmake index e85ecded9..b3eec3dae 100644 --- a/applications/demo/demo.cmake +++ b/applications/demo/demo.cmake @@ -8,4 +8,7 @@ add_subdirectory(demo/2d/swirl_restart) ## swirl ray integration demonstration -add_subdirectory(demo/2d/swirl_rays) \ No newline at end of file +add_subdirectory(demo/2d/swirl_rays) + +## filament and swirl multisolver with exchange demonstration +add_subdirectory(demo/2d/filament_swirl) \ No newline at end of file