Changeset 4925
- Timestamp:
- 08/02/10 13:05:05 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r4924 r4925 1969 1969 tria->CreateKMatrix(Kgg); 1970 1970 delete tria; 1971 1972 /*Delete Vx and Vy averaged*/ 1973 this->inputs->DeleteInput(VxAverageEnum); 1974 this->inputs->DeleteInput(VyAverageEnum); 1975 1971 1976 return; 1972 1977 … … 2002 2007 tria->CreateKMatrix(Kgg); 2003 2008 delete tria; 2009 2010 /*Delete Vx and Vy averaged*/ 2011 this->inputs->DeleteInput(VxAverageEnum); 2012 this->inputs->DeleteInput(VyAverageEnum); 2013 2004 2014 return; 2005 2015 … … 2780 2790 tria->CreateKMatrix(Kgg); 2781 2791 delete tria; 2792 2793 /*Delete Vx and Vy averaged*/ 2794 this->inputs->DeleteInput(VxAverageEnum); 2795 this->inputs->DeleteInput(VyAverageEnum); 2796 2782 2797 return; 2783 2798 … … 3078 3093 if(!onbed)return; 3079 3094 3095 /*Depth Averaging Vx and Vy*/ 3096 this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); 3097 this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); 3098 3080 3099 /*Spawn Tria element from the base of the Penta: */ 3081 3100 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria. 3082 3101 tria->CreatePVector(pg); 3083 3102 delete tria; 3084 this-inputs->DeleteInput(VxAverageEnum); 3085 this-inputs->DeleteInput(VyAverageEnum); 3103 3104 /*Delete Vx and Vy averaged*/ 3105 this->inputs->DeleteInput(VxAverageEnum); 3106 this->inputs->DeleteInput(VyAverageEnum); 3107 3086 3108 return; 3087 3109 } … … 3106 3128 /*Is this element on the bed? :*/ 3107 3129 if(!onbed)return; 3130 3131 /*Depth Averaging Vx and Vy*/ 3132 this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); 3133 this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); 3108 3134 3109 3135 /*Spawn Tria element from the base of the Penta: */ … … 3111 3137 tria->CreatePVector(pg); 3112 3138 delete tria; 3113 this-inputs->DeleteInput(VxAverageEnum); 3114 this-inputs->DeleteInput(VyAverageEnum); 3139 3140 /*Delete Vx and Vy averaged*/ 3141 this->inputs->DeleteInput(VxAverageEnum); 3142 this->inputs->DeleteInput(VyAverageEnum); 3143 3115 3144 return; 3116 3145 } … … 3901 3930 if(!onbed)return; 3902 3931 3932 /*Depth Averaging Vx and Vy*/ 3933 this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); 3934 this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); 3935 3903 3936 /*Spawn Tria element from the base of the Penta: */ 3904 3937 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria. 3905 3938 tria->CreatePVector(pg); 3906 3939 delete tria; 3940 3941 /*Delete Vx and Vy averaged*/ 3907 3942 this-inputs->DeleteInput(VxAverageEnum); 3908 3943 this-inputs->DeleteInput(VyAverageEnum); 3944 3909 3945 return; 3910 3946 } 3911 3947 /*}}}*/ 3912 3948 /*FUNCTION Penta::CreatePVectorSlope {{{1*/ 3913 3914 3949 void Penta::CreatePVectorSlope( Vec pg){ 3915 3950
Note:
See TracChangeset
for help on using the changeset viewer.