/[escript]/trunk/finley/src/Quadrature.c
ViewVC logotype

Diff of /trunk/finley/src/Quadrature.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1170 by btully, Fri May 25 05:24:57 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
 /*  
  ************************************************************  
  *          Copyright 2006 by ACcESS MNRF                   *  
  *                                                          *  
  *              http://www.access.edu.au                    *  
  *       Primary Business: Queensland, Australia            *  
  *  Licensed under the Open Software License version 3.0    *  
  *     http://www.opensource.org/licenses/osl-3.0.php       *  
  *                                                          *  
  ************************************************************  
 */  
1    
2  /**************************************************************/  /* $Id$ */
3    
4  /*   Finley:  */  /*******************************************************
5     *
6     *           Copyright 2003-2007 by ACceSS MNRF
7     *       Copyright 2007 by University of Queensland
8     *
9     *                http://esscc.uq.edu.au
10     *        Primary Business: Queensland, Australia
11     *  Licensed under the Open Software License version 3.0
12     *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16  /**************************************************************/  /**************************************************************/
17    
18  /*   Author: gross@access.edu.au */  /*   Finley:  */
 /*   Version: $Id$ */  
19    
20  /**************************************************************/  /**************************************************************/
21    
# Line 92  void Finley_Quad_getNodesTri(int numQuad Line 90  void Finley_Quad_getNodesTri(int numQuad
90  void Finley_Quad_getNodesTet(int numQuadNodes,double* quadNodes,double* quadWeights) {  void Finley_Quad_getNodesTet(int numQuadNodes,double* quadNodes,double* quadWeights) {
91    int i;    int i;
92    double Q1,Q2,Q3,JA11,JA12,JA13,JA21,JA22,JA23,JA31,JA32,JA33,DET;    double Q1,Q2,Q3,JA11,JA12,JA13,JA21,JA22,JA23,JA31,JA32,JA33,DET;
93      double alpha=0.58541020;
94      double beta =0.13819660;
95    #define DIM 3    #define DIM 3
96        
97    /*  the easy cases: */    /*  the easy cases: */
# Line 101  void Finley_Quad_getNodesTet(int numQuad Line 101  void Finley_Quad_getNodesTet(int numQuad
101      QUADNODES(2,0)=0.25;      QUADNODES(2,0)=0.25;
102      QUADWEIGHTS(0)=1./6.;      QUADWEIGHTS(0)=1./6.;
103    } else if (numQuadNodes==4){    } else if (numQuadNodes==4){
     double alpha=0.58541020;  
     double beta =0.13819660;  
104      QUADNODES(0,0)=beta;      QUADNODES(0,0)=beta;
105      QUADNODES(1,0)=beta;      QUADNODES(1,0)=beta;
106      QUADNODES(2,0)=beta;      QUADNODES(2,0)=beta;
# Line 148  void Finley_Quad_getNodesTet(int numQuad Line 146  void Finley_Quad_getNodesTet(int numQuad
146      if (! Finley_noError()) return;      if (! Finley_noError()) return;
147            
148      /*  squeeze it: */      /*  squeeze it: */
       
149      for (i=0;i<numQuadNodes;i++) {      for (i=0;i<numQuadNodes;i++) {
150        Q1=QUADNODES(0,i);        Q1=QUADNODES(0,i);
151        Q2=QUADNODES(1,i);        Q2=QUADNODES(1,i);

Legend:
Removed from v.1170  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26