Changeset 5989 for issm/trunk/src/c/objects/Elements/Tria.cpp
- Timestamp:
- 09/23/10 13:13:08 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Tria.cpp
r5986 r5989 2425 2425 /*Initialize Element matrix and return if necessary*/ 2426 2426 if(IsOnWater()) return NULL; 2427 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);2427 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 2428 2428 2429 2429 /*Retrieve all Inputs and parameters: */ … … 2530 2530 /*Initialize Element matrix and return if necessary*/ 2531 2531 if(IsOnWater()) return NULL; 2532 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);2532 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 2533 2533 2534 2534 /*Retrieve all inputs and parameters*/ … … 2597 2597 /*Initialize Element matrix and return if necessary*/ 2598 2598 if(IsOnWater()) return NULL; 2599 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);2599 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 2600 2600 2601 2601 /*Retrieve all inputs and parameters*/ … … 2729 2729 /*Initialize Element matrix and return if necessary*/ 2730 2730 if(IsOnWater()) return NULL; 2731 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);2731 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); 2732 2732 2733 2733 /*Retrieve all inputs and parameters*/ … … 2797 2797 /*Initialize Element matrix and return if necessary*/ 2798 2798 if(IsOnWater() || IsOnShelf()) return NULL; 2799 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);2799 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); 2800 2800 2801 2801 /*Retrieve all inputs and parameters*/ … … 2868 2868 /*Initialize Element matrix and return if necessary*/ 2869 2869 if(IsOnWater() || IsOnShelf()) return NULL; 2870 ElementMatrix* Ke1= NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);2871 ElementMatrix* Ke2= NewElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);2870 ElementMatrix* Ke1=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); 2871 ElementMatrix* Ke2=new ElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum); 2872 2872 ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); 2873 2873 delete Ke1; delete Ke2; … … 2957 2957 /*Initialize Element matrix and return if necessary*/ 2958 2958 if(IsOnWater() || IsOnShelf()) return NULL; 2959 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);2959 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum); 2960 2960 2961 2961 /*Retrieve all inputs and parameters*/ … … 3017 3017 /*Initialize Element matrix and return if necessary*/ 3018 3018 if(IsOnWater()) return NULL; 3019 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3019 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3020 3020 3021 3021 /*Create Element matrix*/ … … 3047 3047 /*Initialize Element matrix and return if necessary*/ 3048 3048 if(IsOnWater()) return NULL; 3049 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3049 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3050 3050 3051 3051 /*Retrieve all inputs and parameters*/ … … 3097 3097 /*Initialize Element matrix and return if necessary*/ 3098 3098 if(IsOnWater()) return NULL; 3099 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3099 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3100 3100 3101 3101 /*Retrieve all inputs and parameters*/ … … 3168 3168 /*Initialize Element matrix and return if necessary*/ 3169 3169 if(IsOnWater()) return NULL; 3170 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3170 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3171 3171 3172 3172 /*Retrieve all inputs and parameters*/ … … 3287 3287 /*Initialize Element matrix and return if necessary*/ 3288 3288 if(IsOnWater()) return NULL; 3289 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3289 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3290 3290 3291 3291 /*Retrieve all inputs and parameters*/ … … 3362 3362 /*Initialize Element matrix and return if necessary*/ 3363 3363 if(IsOnWater()) return NULL; 3364 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3364 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3365 3365 3366 3366 GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES); … … 3410 3410 /*Initialize Element matrix and return if necessary*/ 3411 3411 if(IsOnWater() || !IsOnShelf()) return NULL; 3412 ElementMatrix* Ke= NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);3412 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); 3413 3413 3414 3414 /*Retrieve all inputs and parameters*/
Note:
See TracChangeset
for help on using the changeset viewer.