Skip to content

Commit

Permalink
feature-demo: move filament_swirl to demo
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesbrandt committed Apr 12, 2024
1 parent b33be06 commit c2e6dd3
Show file tree
Hide file tree
Showing 43 changed files with 105 additions and 105 deletions.
92 changes: 0 additions & 92 deletions applications/clawpack/advection/2d/filament_swirl/Makefile.am

This file was deleted.

3 changes: 0 additions & 3 deletions applications/clawpack/clawpack.apps
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions applications/clawpack/clawpack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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}")
92 changes: 92 additions & 0 deletions applications/demo/2d/filament_swirl/Makefile.am
Original file line number Diff line number Diff line change
@@ -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)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
5 changes: 4 additions & 1 deletion applications/demo/demo.apps
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
include applications/demo/2d/swirl_restart/Makefile.am

## swirl ray integration demonstration
include applications/demo/2d/swirl_rays/Makefile.am
include applications/demo/2d/swirl_rays/Makefile.am

## filament and swirl multisolver with exchange demonstration
include applications/demo/2d/filament_swirl/Makefile.am
5 changes: 4 additions & 1 deletion applications/demo/demo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
add_subdirectory(demo/2d/swirl_restart)

## swirl ray integration demonstration
add_subdirectory(demo/2d/swirl_rays)
add_subdirectory(demo/2d/swirl_rays)

## filament and swirl multisolver with exchange demonstration
add_subdirectory(demo/2d/filament_swirl)

0 comments on commit c2e6dd3

Please sign in to comment.