Changeset 16833
- Timestamp:
- 11/19/13 15:23:57 (11 years ago)
- Location:
- issm/trunk-jpl/src/c/classes/Elements
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Element.h
r16832 r16833 151 151 virtual int VelocityInterpolation()=0; 152 152 virtual int PressureInterpolation()=0; 153 virtual bool IsZeroLevelset(int levelset_enum)=0; 153 154 154 155 #ifdef _HAVE_RESPONSES_ -
issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
r16832 r16833 3539 3539 int Penta::PressureInterpolation(void){ 3540 3540 return PentaRef::PressureInterpolation(); 3541 } 3542 /*}}}*/ 3543 /*FUNCTION Penta::IsZeroLevelset{{{*/ 3544 bool Penta::IsZeroLevelset(int levelset_enum){ 3545 3546 bool iszerols; 3547 IssmDouble ls[NUMVERTICES]; 3548 3549 /*Retrieve all inputs and parameters*/ 3550 GetInputListOnVertices(&ls[0],levelset_enum); 3551 3552 /*If the level set is awlays <=0, there is no ice front here*/ 3553 iszerols = false; 3554 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 3555 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 3556 iszerols = true; 3557 } 3558 } 3559 return iszerols; 3541 3560 } 3542 3561 /*}}}*/ … … 8730 8749 8731 8750 /*Intermediaries */ 8732 IssmDouble ls[NUMVERTICES];8733 8751 IssmDouble xyz_list[NUMVERTICES][3]; 8734 8752 bool isfront; 8735 8753 8736 /*Retrieve all inputs and parameters*/ 8737 GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); 8738 8739 /*If the level set is awlays <=0, there is no ice front here*/ 8740 isfront = false; 8741 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 8742 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 8743 isfront = true; 8744 } 8745 } 8754 isfront=IsZeroLevelset(MaskIceLevelsetEnum); 8746 8755 8747 8756 /*If no front, return NULL*/ … … 8835 8844 /*Intermediaries */ 8836 8845 int i; 8837 IssmDouble ls[NUMVERTICES];8838 8846 IssmDouble xyz_list[NUMVERTICES][3]; 8839 8847 bool isfront; 8840 8848 8841 8849 /*Retrieve all inputs and parameters*/ 8842 GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); 8843 8844 /*If the level set is awlays <=0, there is no ice front here*/ 8845 isfront = false; 8846 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 8847 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 8848 isfront = true; 8849 } 8850 } 8850 isfront=IsZeroLevelset(MaskIceLevelsetEnum); 8851 8851 8852 8852 /*If no front, return NULL*/ -
issm/trunk-jpl/src/c/classes/Elements/Penta.h
r16832 r16833 113 113 IssmDouble PureIceEnthalpy(IssmDouble pressure); 114 114 int PressureInterpolation(); 115 bool IsZeroLevelset(int levelset_enum); 115 116 116 117 void ResultInterpolation(int* pinterpolation,int output_enum); -
issm/trunk-jpl/src/c/classes/Elements/Seg.h
r16832 r16833 146 146 ElementVector* NewElementVector(int approximation_enum){_error_("not implemented yet");}; 147 147 ElementMatrix* NewElementMatrix(int approximation_enum){_error_("not implemented yet");}; 148 void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; 149 void ViscosityFS(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented");}; 150 void ViscosityHO(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not implemented");}; 151 void ViscositySSA(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not implemented");}; 148 void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; 149 void ViscosityFS(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented");}; 150 void ViscosityHO(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not implemented");}; 151 void ViscositySSA(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){_error_("not implemented");}; 152 bool IsZeroLevelset(int levelset_enum){_error_("not implemented");}; 153 152 154 #ifdef _HAVE_THERMAL_ 153 155 void UpdateBasalConstraintsEnthalpy(void){_error_("not implemented yet");}; -
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r16832 r16833 2959 2959 } 2960 2960 /*}}}*/ 2961 /*FUNCTION Tria::IsZeroLevelset{{{*/ 2962 bool Tria::IsZeroLevelset(int levelset_enum){ 2963 2964 bool iszerols; 2965 IssmDouble ls[NUMVERTICES]; 2966 2967 /*Retrieve all inputs and parameters*/ 2968 GetInputListOnVertices(&ls[0],levelset_enum); 2969 2970 /*If the level set is awlays <0, there is no ice front here*/ 2971 iszerols= false; 2972 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 2973 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 2974 iszerols= true; 2975 } 2976 } 2977 2978 return iszerols; 2979 } 2980 /*}}}*/ 2961 2981 2962 2982 #ifdef _HAVE_RESPONSES_ … … 3904 3924 /*Intermediaries */ 3905 3925 int i; 3906 IssmDouble ls[NUMVERTICES];3907 3926 IssmDouble xyz_list[NUMVERTICES][3]; 3908 3927 bool isfront; 3909 3928 3910 /*Retrieve all inputs and parameters*/3911 GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum);3912 3913 3929 /*If the level set is awlays <=0, there is no ice front here*/ 3914 isfront = false; 3915 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 3916 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 3917 isfront = true; 3918 } 3919 } 3930 isfront=IsZeroLevelset(MaskIceLevelsetEnum); 3920 3931 3921 3932 /*If no front, return NULL*/ … … 4189 4200 4190 4201 /*Intermediaries */ 4191 IssmDouble ls[NUMVERTICES];4192 4202 IssmDouble xyz_list[NUMVERTICES][3]; 4193 4203 bool isfront; 4194 4204 4195 /*Retrieve all inputs and parameters*/ 4196 GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); 4197 4198 /*If the level set is awlays <0, there is no ice front here*/ 4199 isfront = false; 4200 if(ls[0]>0. || ls[1]>0. || ls[2]>0.){ 4201 if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]==0.)){ 4202 isfront = true; 4203 } 4204 } 4205 /*Determine if there is an icefront in this element*/ 4206 isfront=IsZeroLevelset(MaskIceLevelsetEnum); 4205 4207 4206 4208 /*If no front, return NULL*/ -
issm/trunk-jpl/src/c/classes/Elements/Tria.h
r16832 r16833 135 135 void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); 136 136 IssmDouble TimeAdapt(); 137 bool IsZeroLevelset(int levelset_enum); 137 138 138 139 #ifdef _HAVE_RESPONSES_
Note:
See TracChangeset
for help on using the changeset viewer.