Merge 31c6e90 into 659ba31

OpenCMISS · Jul 16, 2018 · 03a702d · 03a702d
2 parents 659ba31 + 31c6e90
commit 03a702d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/basis_routines.F90 b/src/basis_routines.F90
@@ -553,7 +553,7 @@ SUBROUTINE Basis_AreaToXiCoordinates(areaCoordinates,xiCoordinates,err,error,*)
         & " is invalid. The number must be >= 1 and <= 3."
       CALL FlagError(localError,err,error,*999)
     END SELECT
-    
+
     EXITS("Basis_AreaToXiCoordinates")
     RETURN
 999 ERRORSEXITS("Basis_AreaToXiCoordinates",err,error)
@@ -6936,7 +6936,7 @@ SUBROUTINE Gauss_Simplex(order,numberOfVertices,n,x,w,err,error,*)
           CALL FlagError(localError,err,error,*999)
         ENDIF
         !Gauss point 1
-        x(1,1)=1.0_DP/2.0
+        x(1,1)=1.0_DP/2.0_DP
         x(2,1)=1.0_DP/2.0_DP
         w(1)=1.0_DP
       CASE(2)
@@ -7017,7 +7017,7 @@ SUBROUTINE Gauss_Simplex(order,numberOfVertices,n,x,w,err,error,*)
         ENDIF
         !Gauss point 1
         x(1,1)=(1.0_DP-SQRT(0.6_DP))/2.0_DP
-        x(2,1)=1-x(1,1)
+        x(2,1)=1.0_DP-x(1,1)
         w(1)=5.0_DP/18.0_DP
         !Gauss point 2
         x(1,2)=1.0_DP/2.0_DP
@@ -7099,8 +7099,8 @@ SUBROUTINE Gauss_Simplex(order,numberOfVertices,n,x,w,err,error,*)
           CALL FlagError(localError,err,error,*999)
         ENDIF
         lC=1.0_DP/3.0_DP
-        wC=-9.0_DP/16.0
-        alpha1=25.0_DP
+        wC=-3.0_DP/4.0_DP
+        alpha1=2.0_DP/5.0_DP
         wAlpha1=25.0_DP/48.0_DP
         l1Alpha1=(1.0_DP+2.0_DP*alpha1)/3.0_DP
         l2Alpha1=(1.0_DP-alpha1)/3.0_DP