Revert "Modify kernel after separation of mass and stiffness"

This reverts commit 069fc72.

Author: acitrain

src/main/fe/include/sem_proxy_options.h

@@ -16,7 +16,7 @@ class SemProxyOptions
   std::string implem = "geos";  // geos|shiva
   std::string method = "sem";   // sem|dg
   std::string mesh = "cartesian";
-  float dt = 0.003;
+  float dt = 0.006;
   float timemax = 0.7;
   bool autodt = false;
   // snapshots

src/solver/impl/CMakeLists.txt

@@ -6,13 +6,12 @@ add_library(proxy_solver
             src/geos/SEMQ2_unstruct_geos_solver.cpp
             src/geos/SEMQ3_struct_geos_solver.cpp
             src/geos/SEMQ3_unstruct_geos_solver.cpp
-            # src/shiva/SEMQ1_struct_shiva_solver.cpp
-            # src/shiva/SEMQ1_unstruct_shiva_solver.cpp
-            # src/shiva/SEMQ2_struct_shiva_solver.cpp
-            # src/shiva/SEMQ2_unstruct_shiva_solver.cpp
-            # src/shiva/SEMQ3_struct_shiva_solver.cpp
-            # src/shiva/SEMQ3_unstruct_shiva_solver.cpp
-            )
+            src/shiva/SEMQ1_struct_shiva_solver.cpp
+            src/shiva/SEMQ1_unstruct_shiva_solver.cpp
+            src/shiva/SEMQ2_struct_shiva_solver.cpp
+            src/shiva/SEMQ2_unstruct_shiva_solver.cpp
+            src/shiva/SEMQ3_struct_shiva_solver.cpp
+            src/shiva/SEMQ3_unstruct_shiva_solver.cpp)
 
 target_include_directories(proxy_solver
   PUBLIC

src/solver/impl/include/sem_solver_impl.h

@@ -142,52 +142,23 @@ void SEMsolver<ORDER, INTEGRAL_TYPE, MESH_TYPE>::computeElementContributions(
     }
   }
 
-  // INTEGRAL_TYPE::computeMassMatrixAndStiffnessVector(
-  //     elementNumber, m_mesh.getNumberOfPointsPerElement(), cornerCoords,
-  //     m_precomputedIntegralData, massMatrixLocal, pnLocal, Y);
+  INTEGRAL_TYPE::computeMassMatrixAndStiffnessVector(
+      elementNumber, m_mesh.getNumberOfPointsPerElement(), cornerCoords,
+      m_precomputedIntegralData, massMatrixLocal, pnLocal, Y);
 
   auto const inv_model2 = 1.0f / (m_mesh.getModelVpOnElement(elementNumber) *
                                   m_mesh.getModelVpOnElement(elementNumber));
-
-  //Stiffness term
-
-  for(int i = 0; i < m_mesh.getNumberOfPointsPerElement(); ++i)
-  {
-    Y[i] = 0;
-  }
-
-  for(int j = 0; j < m_mesh.getNumberOfPointsPerElement(); ++j)
-  {
-    massMatrixLocal[j] = 0;
-  }
-
-  INTEGRAL_TYPE::computeMassTerm( cornerCoords, [&]( const int j, const real_t val )
-  {
-    //massMatrixLocal[q] = computeMassTerm(q, X);
-    massMatrixLocal[j] += val;
-  } );
-
-  INTEGRAL_TYPE::computeStiffnessTerm( cornerCoords, [&]( const int i, const int j, const real_t val )
-  {
-    float localIncrement = val * pnLocal[j];
-    Y[i] += localIncrement;
-  } );
-
-  
-
-  //Accumulation
   for (int i = 0; i < m_mesh.getNumberOfPointsPerElement(); ++i)
   {
     int x = i % dim;
     int z = (i / dim) % dim;
     int y = i / (dim * dim);
-    int const gIndex = m_mesh.globalNodeIndex(elementNumber, x, y, z);   
+    int const gIndex = m_mesh.globalNodeIndex(elementNumber, x, y, z);
     massMatrixLocal[i] *= inv_model2;
-    ATOMICADD(massMatrixGlobal[gIndex], massMatrixLocal[i]); 
+    ATOMICADD(massMatrixGlobal[gIndex], massMatrixLocal[i]);
     ATOMICADD(yGlobal[gIndex], Y[i]);
   }
 
-
   MAINLOOPEND
 }
 

src/solver/impl/src/solver_factory.cc

@@ -72,8 +72,8 @@ std::unique_ptr<SolverBase> createSolver(methodType const methodType,
     {
       case GEOS:
         return make_sem_solver<IntegralType::GEOS>(order, mesh);
-      // case SHIVA:
-      //   return make_sem_solver<IntegralType::SHIVA>(order, mesh);
+      case SHIVA:
+        return make_sem_solver<IntegralType::SHIVA>(order, mesh);
     }
   }