Merge pull request #1588 from PrincetonUniversity/1554-dk

1554 - Rename structs in kokkos_kernels

Author: icui

core/specfem/CMakeLists.txt

@@ -3,7 +3,7 @@ add_subdirectory(algorithms)
 add_subdirectory(assembly)
 add_subdirectory(attenuation)
 add_subdirectory(jacobian)
-add_subdirectory(kokkos_kernels)
+add_subdirectory(compute)
 add_subdirectory(logger)
 add_subdirectory(macros)
 add_subdirectory(mesh)
@@ -32,7 +32,7 @@ target_link_libraries(specfem_core_interface
         specfem::algorithms
         specfem::assembly
         specfem::jacobian
-        specfem::kokkos_kernels
+        specfem::compute
         specfem::logger
         specfem::macros
         specfem::mesh

core/specfem/algorithms/coupling_integral.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "enumerations/interface.hpp"
-#include "specfem/assembly/nonconforming_interfaces.hpp"
+#include "specfem/assembly.hpp"
 #include "specfem/execution.hpp"
 #include "specfem/point.hpp"
 #include <Kokkos_Core.hpp>

core/specfem/algorithms/gradient.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "kokkos_abstractions.h"
-#include "specfem/assembly/jacobian_matrix.hpp"
+#include "specfem/assembly.hpp"
 #include "specfem/data_access.hpp"
 #include "specfem/execution.hpp"
 #include "specfem/point.hpp"

core/specfem/algorithms/locate_point.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "enumerations/mesh_entities.hpp"
-#include "specfem/assembly/mesh.hpp"
+#include "specfem/assembly.hpp"
 #include "specfem/point.hpp"
 
 namespace specfem {

core/specfem/assembly/assembly/dim2/assembly.hpp

@@ -200,7 +200,7 @@ template <> struct assembly<specfem::dimension::type::dim2> {
    */
   Kokkos::View<type_real ****, Kokkos::LayoutLeft, Kokkos::HostSpace>
   generate_wavefield_on_entire_grid(
-      const specfem::wavefield::simulation_field wavefield,
+      const specfem::simulation::field_type wavefield,
       const specfem::wavefield::type component);
 
   /**

core/specfem/assembly/assembly/dim2/compute_wavefield/compute_wavefield.cpp

@@ -41,7 +41,7 @@ void get_wavefield_on_entire_grid(
 Kokkos::View<type_real ****, Kokkos::LayoutLeft, Kokkos::HostSpace>
 specfem::assembly::assembly<specfem::dimension::type::dim2>::
     generate_wavefield_on_entire_grid(
-        const specfem::wavefield::simulation_field wavefield,
+        const specfem::simulation::field_type wavefield,
         const specfem::wavefield::type component) {
 
   // Check which type of wavefield component is requested
@@ -66,11 +66,11 @@ specfem::assembly::assembly<specfem::dimension::type::dim2>::
   }();
 
   // Copy the required wavefield into the buffer
-  if (wavefield == specfem::wavefield::simulation_field::forward) {
+  if (wavefield == specfem::simulation::field_type::forward) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.forward);
-  } else if (wavefield == specfem::wavefield::simulation_field::adjoint) {
+  } else if (wavefield == specfem::simulation::field_type::adjoint) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.adjoint);
-  } else if (wavefield == specfem::wavefield::simulation_field::backward) {
+  } else if (wavefield == specfem::simulation::field_type::backward) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.backward);
   } else {
     throw std::runtime_error("Wavefield type not supported");

core/specfem/assembly/assembly/dim3/assembly.hpp

@@ -160,7 +160,7 @@ template <> struct assembly<specfem::dimension::type::dim3> {
    */
   Kokkos::View<type_real *****, Kokkos::LayoutLeft, Kokkos::HostSpace>
   generate_wavefield_on_entire_grid(
-      const specfem::wavefield::simulation_field wavefield,
+      const specfem::simulation::field_type wavefield,
       const specfem::wavefield::type component);
 
   /**

core/specfem/assembly/assembly/dim3/compute_wavefield/compute_wavefield.cpp

@@ -41,7 +41,7 @@ void get_wavefield_on_entire_grid(
 Kokkos::View<type_real *****, Kokkos::LayoutLeft, Kokkos::HostSpace>
 specfem::assembly::assembly<specfem::dimension::type::dim3>::
     generate_wavefield_on_entire_grid(
-        const specfem::wavefield::simulation_field wavefield,
+        const specfem::simulation::field_type wavefield,
         const specfem::wavefield::type component) {
 
   // Check which type of wavefield component is requested
@@ -66,11 +66,11 @@ specfem::assembly::assembly<specfem::dimension::type::dim3>::
   }();
 
   // Copy the required wavefield into the buffer
-  if (wavefield == specfem::wavefield::simulation_field::forward) {
+  if (wavefield == specfem::simulation::field_type::forward) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.forward);
-  } else if (wavefield == specfem::wavefield::simulation_field::adjoint) {
+  } else if (wavefield == specfem::simulation::field_type::adjoint) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.adjoint);
-  } else if (wavefield == specfem::wavefield::simulation_field::backward) {
+  } else if (wavefield == specfem::simulation::field_type::backward) {
     specfem::assembly::deep_copy(this->fields.buffer, this->fields.backward);
   } else {
     throw std::runtime_error("Wavefield type not supported");

core/specfem/assembly/assembly/impl/helper.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
 #include "enumerations/interface.hpp"
-#include "medium/medium.hpp"
 #include "specfem/assembly/assembly.hpp"
 #include "specfem/assembly/assembly/impl/helper.hpp"
 #include "specfem/chunk_element.hpp"
 #include "specfem/execution.hpp"
+#include "specfem/medium_physics.hpp"
 #include "specfem/parallel_configuration.hpp"
 #include "specfem/point.hpp"
 #include <Kokkos_Core.hpp>

core/specfem/assembly/fields.hpp

@@ -12,7 +12,7 @@ namespace specfem::assembly {
  * computations.
  */
 template <specfem::dimension::type DimensionTag,
-          specfem::wavefield::simulation_field SimulationWavefieldType>
+          specfem::simulation::field_type SimulationWavefieldType>
 struct simulation_field;
 
 } // namespace specfem::assembly