Changeset 4910
- Timestamp:
- 07/30/10 12:49:00 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r4899 r4910 215 215 ResetPenaltiesEnum, 216 216 RheologyBEnum, 217 RheologyB2dEnum, 217 218 RheologyNEnum, 218 219 SegmentOnIceShelfEnum, -
issm/trunk/src/c/Makefile.am
r4907 r4910 153 153 ./objects/Elements/Beam.h\ 154 154 ./objects/Elements/Beam.cpp\ 155 ./objects/Elements/BeamRef.h\ 156 ./objects/Elements/BeamRef.cpp\ 155 157 ./objects/Elements/Penta.h\ 156 158 ./objects/Elements/Penta.cpp\ … … 709 711 ./objects/Elements/Beam.h\ 710 712 ./objects/Elements/Beam.cpp\ 713 ./objects/Elements/BeamRef.h\ 714 ./objects/Elements/BeamRef.cpp\ 711 715 ./objects/Elements/Penta.h\ 712 716 ./objects/Elements/Penta.cpp\ -
issm/trunk/src/c/objects/Elements/Beam.cpp
r4880 r4910 1058 1058 } 1059 1059 /*}}}*/ 1060 /*FUNCTION Beam::GetJacobianDeterminant{{{1*/1061 void Beam::GetJacobianDeterminant(double* pJdet,double* z_list, double gauss_coord){1062 1063 1064 double Jdet;1065 1066 Jdet=1.0/2.0*(z_list[1]-z_list[0]);1067 1068 if(Jdet<0){1069 ISSMERROR(" negative jacobian determinant!");1070 }1071 1072 *pJdet=Jdet;1073 }1074 /*}}}*/1075 /*FUNCTION Beam::GetNodalFunctions{{{1*/1076 void Beam::GetNodalFunctions(double* l1l2, double gauss_coord){1077 1078 /*This routine returns the values of the nodal functions at the gaussian point.*/1079 1080 /*First nodal function: */1081 l1l2[0]=-0.5*gauss_coord+0.5;1082 1083 /*Second nodal function: */1084 l1l2[1]=+0.5*gauss_coord+0.5;1085 }1086 /*}}}*/1087 1060 /*FUNCTION Beam::GetParameterValue{{{1*/ 1088 1061 void Beam::GetParameterValue(double* pvalue, double* value_list,double gauss_coord){ -
issm/trunk/src/c/objects/Elements/Beam.h
r4880 r4910 10 10 11 11 #include "./Element.h" 12 #include "./BeamRef.h" 12 13 class Hook; 13 14 class Parameters; … … 22 23 /*}}}*/ 23 24 24 class Beam: public Element {25 class Beam: public Element,public BeamRef { 25 26 26 27 public: … … 67 68 void Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters); 68 69 void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters); 69 double 70 double CostFunction(void); 70 71 void CreateKMatrix(Mat Kgg); 71 72 void CreatePVector(Vec pg); 72 void DeleteResults(void);73 void DeleteResults(void); 73 74 void GetBedList(double* bed_list); 74 75 void* GetMatPar(); … … 102 103 void MinVy(double* pminvy, bool process_units); 103 104 void MinVz(double* pminvz, bool process_units); 104 double 105 double Misfit(void); 105 106 void PatchFill(int* pcount, Patch* patch); 106 107 void PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes); 107 108 void ProcessResultsUnits(void); 108 double 109 void 110 void 109 double SurfaceArea(void); 110 void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type); 111 void UpdateGeometry(void){ISSMERROR("not implemented yet");}; 111 112 /*}}}*/ 112 113 /*Beam specific routines: {{{1*/ … … 115 116 void GetDofList(int* doflist,int* pnumberofdofs); 116 117 void GetDofList1(int* doflist); 117 void GetJacobianDeterminant(double* pJdet,double* z_list, double gauss_coord);118 void GetNodalFunctions(double* l1l2, double gauss_coord);119 118 void GetParameterValue(double* pp, double* plist, double* gauss_l1l2l3); 120 119 void GetParameterValue(double* pvalue, double* value_list,double gauss_coord); -
issm/trunk/src/c/objects/Elements/TriaRef.cpp
r4898 r4910 256 256 /*Get Determinant*/ 257 257 Matrix2x2Determinant(Jdet,&J[0][0]); 258 if( Jdet<0) ISSMERROR("negative jacobian determinant!");258 if(*Jdet<0) ISSMERROR("negative jacobian determinant!"); 259 259 260 260 } … … 277 277 z3=*(xyz_list+3*2+2); 278 278 279 280 279 *Jdet=SQRT3/6.0*pow(pow(((y2-y1)*(z3-z1)-(z2-z1)*(y3-y1)),2.0)+pow(((z2-z1)*(x3-x1)-(x2-x1)*(z3-z1)),2.0)+pow(((x2-x1)*(y3-y1)-(y2-y1)*(x3-x1)),2.0),0.5); 281 282 if(Jdet<0){ 283 ISSMERROR("negative jacobian determinant!"); 284 } 280 if(*Jdet<0) ISSMERROR("negative jacobian determinant!"); 285 281 286 282 } -
issm/trunk/src/c/objects/Inputs/BeamVertexInput.h
r4899 r4910 10 10 /*{{{1*/ 11 11 #include "./Input.h" 12 #include "../Elements/BeamRef.h" 12 13 /*}}}*/ 13 14 14 15 15 class BeamVertexInput: public Input {16 class BeamVertexInput: public Input,public BeamRef{ 16 17 17 18 public: -
issm/trunk/src/c/objects/objects.h
r4899 r4910 34 34 /*Elements: */ 35 35 #include "./Elements/Beam.h" 36 #include "./Elements/BeamRef.h" 36 37 #include "./Elements/Element.h" 37 38 #include "./Elements/Penta.h"
Note:
See TracChangeset
for help on using the changeset viewer.