diff --git a/benchmarks/data/CMakeFiles/Par_File.in b/benchmarks/data/CMakeFiles/Par_File.in index 160f2c1d..cf9d0b2c 100644 --- a/benchmarks/data/CMakeFiles/Par_File.in +++ b/benchmarks/data/CMakeFiles/Par_File.in @@ -128,7 +128,7 @@ interfacesfile = @CMAKE_SOURCE_DIR@/benchmarks/data/topography. # geometry of the model (origin lower-left corner = 0,0) and mesh description xmin = 0.d0 # abscissa of left side of the model xmax = 4000.d0 # abscissa of right side of the model -nx = 180 # number of elements along X +nx = 1800 # number of elements along X STACEY_ABSORBING_CONDITIONS = .false. @@ -141,7 +141,7 @@ absorbleft = .false. # define the different regions of the model in the (nx,nz) spectral-element mesh nbregions = 1 # then set below the different regions and model number for each region # format of each line: nxmin nxmax nzmin nzmax material_number -1 180 1 60 1 +1 1800 1 600 1 #----------------------------------------------------------- # diff --git a/benchmarks/data/topography.dat b/benchmarks/data/topography.dat index b8999ae1..9d1df59d 100644 --- a/benchmarks/data/topography.dat +++ b/benchmarks/data/topography.dat @@ -22,4 +22,4 @@ # # layer number 1 (bottom layer) # - 60 + 600 diff --git a/benchmarks/data_aniso/CMakeFiles/Par_File.in b/benchmarks/data_aniso/CMakeFiles/Par_File.in index ae573f9d..079ac477 100644 --- a/benchmarks/data_aniso/CMakeFiles/Par_File.in +++ b/benchmarks/data_aniso/CMakeFiles/Par_File.in @@ -108,7 +108,7 @@ interfacesfile = @CMAKE_SOURCE_DIR@/benchmarks/data_aniso/topoa # geometry of the model (origin lower-left corner = 0,0) and mesh description xmin = 0.d0 # abscissa of left side of the model xmax = 0.33 # abscissa of right side of the model -nx = 160 # number of elements along X +nx = 1200 # number of elements along X # Stacey ABC STACEY_ABSORBING_CONDITIONS = .false. @@ -122,7 +122,7 @@ absorbleft = .false. # define the different regions of the model in the (nx,nz) spectral-element mesh nbregions = 1 # then set below the different regions and model number for each region # format of each line: nxmin nxmax nzmin nzmax material_number -1 160 1 60 1 +1 1200 1 400 1 #----------------------------------------------------------- # diff --git a/benchmarks/data_aniso/topoaniso.dat b/benchmarks/data_aniso/topoaniso.dat index 048de0d7..b193c461 100644 --- a/benchmarks/data_aniso/topoaniso.dat +++ b/benchmarks/data_aniso/topoaniso.dat @@ -23,4 +23,4 @@ # # layer number 1 (bottom layer) # - 60 + 600 diff --git a/benchmarks/data_iso/CMakeFiles/Par_File.in b/benchmarks/data_iso/CMakeFiles/Par_File.in index 1a969f2a..66695079 100644 --- a/benchmarks/data_iso/CMakeFiles/Par_File.in +++ b/benchmarks/data_iso/CMakeFiles/Par_File.in @@ -128,7 +128,7 @@ interfacesfile = @CMAKE_SOURCE_DIR@/benchmarks/data_iso/topogra # geometry of the model (origin lower-left corner = 0,0) and mesh description xmin = 0.d0 # abscissa of left side of the model xmax = 4000.d0 # abscissa of right side of the model -nx = 180 # number of elements along X +nx = 1800 # number of elements along X STACEY_ABSORBING_CONDITIONS = .false. @@ -141,7 +141,7 @@ absorbleft = .false. # define the different regions of the model in the (nx,nz) spectral-element mesh nbregions = 1 # then set below the different regions and model number for each region # format of each line: nxmin nxmax nzmin nzmax material_number -1 180 1 60 1 +1 1800 1 600 1 #----------------------------------------------------------- # diff --git a/benchmarks/data_iso/topography.dat b/benchmarks/data_iso/topography.dat index b8999ae1..9d1df59d 100644 --- a/benchmarks/data_iso/topography.dat +++ b/benchmarks/data_iso/topography.dat @@ -22,4 +22,4 @@ # # layer number 1 (bottom layer) # - 60 + 600 diff --git a/benchmarks/main.cpp b/benchmarks/main.cpp index 8c35ec22..3807da23 100644 --- a/benchmarks/main.cpp +++ b/benchmarks/main.cpp @@ -8,21 +8,12 @@ namespace benchmarks { template inline void update_wavefields(specfem::compute::assembly &assembly, const int istep) { - constexpr static auto dimension = specfem::dimension::type::dim2; - constexpr static auto wavefield = - specfem::wavefield::simulation_field::forward; - constexpr static auto ngll = 5; - - compute_stiffness_interaction( + + compute_stiffness_interaction( assembly, istep); if constexpr (medium == specfem::element::medium_tag::elastic) { - compute_stiffness_interaction< - dimension, wavefield, ngll, medium, - specfem::element::property_tag::anisotropic, - specfem::element::boundary_tag::none>(assembly, istep); + compute_stiffness_interaction(assembly, istep); } divide_mass_matrix(assembly); diff --git a/benchmarks/stiffness.hpp b/benchmarks/stiffness.hpp index 11ba7767..27521c0d 100644 --- a/benchmarks/stiffness.hpp +++ b/benchmarks/stiffness.hpp @@ -25,23 +25,21 @@ namespace specfem { namespace benchmarks { -template +constexpr static auto dimension = specfem::dimension::type::dim2; +constexpr static auto wavefield = + specfem::wavefield::simulation_field::forward; +constexpr static auto ngll = 5; +constexpr static auto boundary_tag = specfem::element::boundary_tag::none; + +template void compute_stiffness_interaction( const specfem::compute::assembly &assembly, const int &istep) { constexpr auto medium_tag = MediumTag; constexpr auto property_tag = PropertyTag; - constexpr auto boundary_tag = BoundaryTag; - constexpr int ngll = NGLL; - constexpr auto wavefield = WavefieldType; - constexpr auto dimension = DimensionType; const auto elements = assembly.element_types.get_elements_on_device( - MediumTag, PropertyTag, BoundaryTag); + MediumTag, PropertyTag, boundary_tag); const int nelements = elements.extent(0);