Changeset 3968
- Timestamp:
- 05/27/10 10:43:40 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/DataSet/DataSet.cpp
r3967 r3968 1197 1197 } 1198 1198 /*}}}*/ 1199 /*FUNCTION DataSet::SurfaceArea{{{1*/1200 void DataSet::SurfaceArea(double* pS,int analysis_type,int sub_analysis_type){1201 1202 double S=0;1203 1204 vector<Object*>::iterator object;1205 Element* element=NULL;1206 1207 for ( object=objects.begin() ; object < objects.end(); object++ ){1208 1209 if(EnumIsElement((*object)->Enum())){1210 1211 element=(Element*)(*object);1212 S+=element->SurfaceArea(analysis_type,sub_analysis_type);1213 1214 }1215 }1216 1217 /*Assign output pointers:*/1218 *pS=S;1219 1220 }1221 /*}}}*/1222 1199 /*FUNCTION DataSet::UpdateInputsFromSolution{{{1*/ 1223 1200 void DataSet::UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ -
issm/trunk/src/c/DataSet/DataSet.h
r3967 r3968 81 81 void MeltingConstraints(int* pconverged, int* pnum_unstable_constraints,int analysis_type,int sub_analysis_type); 82 82 DataSet* Copy(void); 83 void SurfaceArea(double* pS, int analysis_type,int sub_analysis_type);84 83 void FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field); 85 84 void FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname); -
issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.cpp
r3913 r3968 13 13 int analysis_type,int sub_analysis_type){ 14 14 15 /*Intermediary*/ 16 Element* element=NULL; 17 int i; 18 15 19 /*output: */ 16 double S ;20 double S=0; 17 21 double S_sum; 18 22 … … 22 26 23 27 /*Compute gradients: */ 24 elements->SurfaceArea(&S,analysis_type,sub_analysis_type); 28 for (i=0;i<elements->Size();i++){ 29 element=(Element*)elements->GetObjectByOffset(i); 30 S+=element->SurfaceArea(analysis_type,sub_analysis_type); 31 } 25 32 26 33 /*Sum all J from all cpus of the cluster:*/
Note:
See TracChangeset
for help on using the changeset viewer.