[cig-commits] [commit] master: fixing fluid stiffness (45c055c)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/be819aae57cc99f055989132fc778afa4778d3ec...3a7fbbac2b69a2178e788da14208ab04e301cc5e

>---------------------------------------------------------------

commit 45c055c95789a97c1dd6a733a3f86723a371d36b
Author: martinvandriel <martin at vandriel.de>
Date:   Tue Sep 16 20:10:29 2014 +0200

    fixing fluid stiffness


>---------------------------------------------------------------

45c055c95789a97c1dd6a733a3f86723a371d36b
 SOLVER/stiffness.f90 | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SOLVER/stiffness.f90 b/SOLVER/stiffness.f90
index eddb96b..6acee3e 100644
--- a/SOLVER/stiffness.f90
+++ b/SOLVER/stiffness.f90
@@ -2193,7 +2193,11 @@ pure subroutine glob_fluid_stiffness_generic(glob_stiffness_fl, chi)
      m4chil(0:npol,0:npol) = M4chi_fl(:,:,ielem)
 
      ! First MxM
-     call mxm(G2T, chi_l, X1)
+     if ( axis_fluid(ielem) ) then
+        call mxm(G1T, chi_l, X1)
+     else
+        call mxm(G2T, chi_l, X1)
+     endif
      call mxm(chi_l, G2, X2)
 
      ! Collocations and sums of D terms
@@ -2201,7 +2205,11 @@ pure subroutine glob_fluid_stiffness_generic(glob_stiffness_fl, chi)
      S2 = m1chil * X1 + m4chil * X2
 
      !Second MxM
-     call mxm(G2, S1, X1)
+     if ( axis_fluid(ielem) ) then
+        call mxm(G1, S1, X1)
+     else
+        call mxm(G2, S1, X1)
+     endif
      call mxm(S2, G2T, X2)
      
      ! Final Sum
@@ -2267,7 +2275,11 @@ pure subroutine glob_fluid_stiffness_4(glob_stiffness_fl, chi)
      m4chil(0:npol,0:npol) = M4chi_fl(:,:,ielem)
 
      ! First MxM
-     call mxm_4(G2T, chi_l, X1)
+     if ( axis_fluid(ielem) ) then
+        call mxm_4(G1T, chi_l, X1)
+     else
+        call mxm_4(G2T, chi_l, X1)
+     endif
      call mxm_4(chi_l, G2, X2)
 
      ! Collocations and sums of D terms
@@ -2275,7 +2287,11 @@ pure subroutine glob_fluid_stiffness_4(glob_stiffness_fl, chi)
      S2 = m1chil * X1 + m4chil * X2
 
      !Second MxM
-     call mxm_4(G2, S1, X1)
+     if ( axis_fluid(ielem) ) then
+        call mxm_4(G1, S1, X1)
+     else
+        call mxm_4(G2, S1, X1)
+     endif
      call mxm_4(S2, G2T, X2)
      
      ! Final Sum