Bugfix

SeisSol · May 14, 2018 · f077d72 · f077d72
1 parent 27e4416
commit f077d72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/generated_code/DynamicRupture.py b/generated_code/DynamicRupture.py
@@ -59,17 +59,9 @@ def addMatrices(db, matricesDir, order, dynamicRuptureMethod, numberOfElasticQua
 
   # Determine matrices
   # Note: This does only work because the flux does not depend on the mechanisms in the case of viscoelastic attenuation
-  godunovMatrixSpp = np.matlib.zeros((numberOfQuantities,numberOfQuantities))
-  godunovMatrixSpp[0:numberOfElasticQuantities,0:numberOfElasticQuantities] = 1.
-  db.insert(DB.MatrixInfo('godunovMatrix', numberOfQuantities, numberOfQuantities, matrix=godunovMatrixSpp))
-
-  fluxSolverSpp = np.matlib.zeros((numberOfQuantities,numberOfQuantities))
-  fluxSolverSpp[0:numberOfElasticQuantities,:] = 1.
-  db.insert(DB.MatrixInfo('fluxSolver', numberOfQuantities, numberOfQuantities, matrix=fluxSolverSpp))
-
-  godunovStateSpp = np.matlib.zeros((numberOfPoints,numberOfQuantities))
-  godunovStateSpp[:,0:numberOfElasticQuantities] = 1.
-  db.insert(DB.MatrixInfo('godunovState', numberOfPoints, numberOfQuantities, matrix=godunovStateSpp))
+  db.insert(DB.MatrixInfo('godunovMatrix', numberOfElasticQuantities, numberOfElasticQuantities)) 
+  db.insert(DB.MatrixInfo('fluxSolver', numberOfElasticQuantities, numberOfQuantities))
+  db.insert(DB.MatrixInfo('godunovState', numberOfPoints, numberOfElasticQuantities))
 
   stiffnessOrder = { 'Xi': 0, 'Eta': 1, 'Zeta': 2 }
   globalMatrixIdRules = [

diff --git a/generated_code/viscoelastic2.py b/generated_code/viscoelastic2.py
@@ -105,6 +105,7 @@
 db.insert(DB.MatrixInfo('reducedTimeIntegratedDofs', numberOfBasisFunctions, numberOfReducedQuantities))
 db.insert(DB.MatrixInfo('reducedDofs', numberOfBasisFunctions, numberOfReducedQuantities))
 db.insert(DB.MatrixInfo('mechanism', numberOfBasisFunctions, numberOfMechanismQuantities))
+db.insert(DB.MatrixInfo('timeDerivative0_elastic', numberOfBasisFunctions, numberOfElasticQuantities))
 
 volume = db['kXiDivM'] * db['reducedTimeIntegratedDofs'] * db['AstarT'] \
        + db['kEtaDivM'] * db['reducedTimeIntegratedDofs'] * db['BstarT'] \
@@ -136,7 +137,7 @@
 source = db['mechanism'] * db['ET']
 kernels.append(Kernel.Prototype('source', source))
 
-DynamicRupture.addKernels(db, kernels, 'reducedDofs')
+DynamicRupture.addKernels(db, kernels, 'timeDerivative0_elastic')
 Plasticity.addKernels(db, kernels)
 SurfaceDisplacement.addKernels(db, kernels)
 

diff --git a/src/Initializer/CellLocalMatrices.cpp b/src/Initializer/CellLocalMatrices.cpp
@@ -225,8 +225,8 @@ void seissol::initializers::initializeDynamicRuptureMatrices( MeshReader const&
                                                               GlobalData const&      global,
                                                               TimeStepping const&/*    timeStepping*/ )
 {
-  real TData[seissol::model::godunovMatrix::rows * seissol::model::godunovMatrix::cols];
-  real TinvData[seissol::model::godunovMatrix::rows * seissol::model::godunovMatrix::cols];
+  real TData[seissol::model::AplusT::rows * seissol::model::AplusT::cols];
+  real TinvData[seissol::model::AplusT::rows * seissol::model::AplusT::cols];
   real QgodLocalData[9*9];
   real QgodNeighborData[9*9];
   real APlusData[seissol::model::AstarT::reals];
@@ -340,8 +340,8 @@ void seissol::initializers::initializeDynamicRuptureMatrices( MeshReader const&
       }
 
       /// Transformation matrix
-      DenseMatrixView<seissol::model::godunovMatrix::rows, seissol::model::godunovMatrix::cols> T(TData);
-      DenseMatrixView<seissol::model::godunovMatrix::cols, seissol::model::godunovMatrix::rows> Tinv(TinvData);
+      DenseMatrixView<seissol::model::AplusT::rows, seissol::model::AplusT::cols> T(TData);
+      DenseMatrixView<seissol::model::AplusT::cols, seissol::model::AplusT::rows> Tinv(TinvData);
       seissol::model::getFaceRotationMatrix(fault[meshFace].normal, fault[meshFace].tangent1, fault[meshFace].tangent2, T, Tinv);
 
       /// Materials