Changeset 12481
- Timestamp:
- 06/20/12 14:49:59 (13 years ago)
- 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 51 51 52 52 /*Allocate GaussTria fields*/ 53 coords1=xNew<Issm Double>(numgauss*sizeof(IssmDouble));54 coords2=xNew<Issm Double>(numgauss*sizeof(IssmDouble));55 coords3=xNew<Issm Double>(numgauss*sizeof(IssmDouble));56 weights=xNew<Issm Double>(numgauss*sizeof(IssmDouble));53 coords1=xNew<IssmPDouble>(numgauss); 54 coords2=xNew<IssmPDouble>(numgauss); 55 coords3=xNew<IssmPDouble>(numgauss); 56 weights=xNew<IssmPDouble>(numgauss); 57 57 58 58 /*Reverse index1 and 2 if necessary*/ … … 97 97 /*FUNCTION GaussTria::~GaussTria(){{{*/ 98 98 GaussTria::~GaussTria(){ 99 xDelete<Issm Double>(weights);100 xDelete<Issm Double>(coords1);101 xDelete<Issm Double>(coords2);102 xDelete<Issm Double>(coords3);99 xDelete<IssmPDouble>(weights); 100 xDelete<IssmPDouble>(coords1); 101 xDelete<IssmPDouble>(coords2); 102 xDelete<IssmPDouble>(coords3); 103 103 } 104 104 /*}}}*/ … … 199 199 /*}}}*/ 200 200 /*FUNCTION GaussTria::GaussFromCoords{{{*/ 201 void GaussTria::GaussFromCoords(Issm Double x,IssmDouble y,IssmDouble* xyz_list){201 void GaussTria::GaussFromCoords(IssmPDouble x,IssmPDouble y,IssmPDouble* xyz_list){ 202 202 203 203 /*Intermediaries*/ 204 Issm Double area = 0;205 Issm Double x1,y1,x2,y2,x3,y3;204 IssmPDouble area = 0; 205 IssmPDouble x1,y1,x2,y2,x3,y3; 206 206 207 207 /*in debugging mode: check that the default constructor has been called*/ -
issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h
r12424 r12481 15 15 private: 16 16 int numgauss; 17 Issm Double* weights;18 Issm Double* coords1;19 Issm Double* coords2;20 Issm Double* coords3;17 IssmPDouble* weights; 18 IssmPDouble* coords1; 19 IssmPDouble* coords2; 20 IssmPDouble* coords3; 21 21 22 22 public: 23 Issm Double weight;24 Issm Double coord1;25 Issm Double coord2;26 Issm Double coord3;23 IssmPDouble weight; 24 IssmPDouble coord1; 25 IssmPDouble coord2; 26 IssmPDouble coord3; 27 27 28 28 public: … … 38 38 int end(void); 39 39 void Echo(void); 40 void GaussFromCoords(Issm Double x1,IssmDouble y1,IssmDouble* xyz_list);40 void GaussFromCoords(IssmPDouble x1,IssmPDouble y1,IssmPDouble* xyz_list); 41 41 void GaussPoint(int ig); 42 42 void GaussVertex(int iv);
Note:
See TracChangeset
for help on using the changeset viewer.