Changeset 12481


Ignore:
Timestamp:
06/20/12 14:49:59 (13 years ago)
Author:
utke
Message:

these are supposed to be non-differentiable (confirmed w M. Morlighem)

Location:
issm/trunk-jpl/src/c/objects/Gauss
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp

    r12455 r12481  
    5151
    5252        /*Allocate GaussTria fields*/
    53         coords1=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
    54         coords2=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
    55         coords3=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
    56         weights=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
     53        coords1=xNew<IssmPDouble>(numgauss);
     54        coords2=xNew<IssmPDouble>(numgauss);
     55        coords3=xNew<IssmPDouble>(numgauss);
     56        weights=xNew<IssmPDouble>(numgauss);
    5757
    5858        /*Reverse index1 and 2 if necessary*/
     
    9797/*FUNCTION GaussTria::~GaussTria(){{{*/
    9898GaussTria::~GaussTria(){
    99         xDelete<IssmDouble>(weights);
    100         xDelete<IssmDouble>(coords1);
    101         xDelete<IssmDouble>(coords2);
    102         xDelete<IssmDouble>(coords3);
     99        xDelete<IssmPDouble>(weights);
     100        xDelete<IssmPDouble>(coords1);
     101        xDelete<IssmPDouble>(coords2);
     102        xDelete<IssmPDouble>(coords3);
    103103}
    104104/*}}}*/
     
    199199/*}}}*/
    200200/*FUNCTION GaussTria::GaussFromCoords{{{*/
    201 void GaussTria::GaussFromCoords(IssmDouble x,IssmDouble y,IssmDouble* xyz_list){
     201void GaussTria::GaussFromCoords(IssmPDouble x,IssmPDouble y,IssmPDouble* xyz_list){
    202202
    203203        /*Intermediaries*/
    204         IssmDouble    area = 0;
    205         IssmDouble    x1,y1,x2,y2,x3,y3;
     204        IssmPDouble    area = 0;
     205        IssmPDouble    x1,y1,x2,y2,x3,y3;
    206206
    207207        /*in debugging mode: check that the default constructor has been called*/
  • issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h

    r12424 r12481  
    1515        private:
    1616                int numgauss;
    17                 IssmDouble* weights;
    18                 IssmDouble* coords1;
    19                 IssmDouble* coords2;
    20                 IssmDouble* coords3;
     17                IssmPDouble* weights;
     18                IssmPDouble* coords1;
     19                IssmPDouble* coords2;
     20                IssmPDouble* coords3;
    2121
    2222        public:
    23                 IssmDouble weight;
    24                 IssmDouble coord1;
    25                 IssmDouble coord2;
    26                 IssmDouble coord3;
     23                IssmPDouble weight;
     24                IssmPDouble coord1;
     25                IssmPDouble coord2;
     26                IssmPDouble coord3;
    2727               
    2828        public:
     
    3838                int  end(void);
    3939                void Echo(void);
    40                 void GaussFromCoords(IssmDouble x1,IssmDouble y1,IssmDouble* xyz_list);
     40                void GaussFromCoords(IssmPDouble x1,IssmPDouble y1,IssmPDouble* xyz_list);
    4141                void GaussPoint(int ig);
    4242                void GaussVertex(int iv);
Note: See TracChangeset for help on using the changeset viewer.