Changeset 3446
- Timestamp:
- 04/08/10 06:50:07 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 3 added
- 1 deleted
- 70 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials,DataSet* parameters){12 void ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,DataSet* parameters){ 13 13 14 14 int i; … … 27 27 28 28 /*Get elements configured: */ 29 elements->Configure(elements,loads, nodes, materials,parameters);30 parameters->Configure(elements,loads, nodes, materials,parameters);29 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 30 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 31 31 32 32 /*Call on dataset driver: */ -
issm/trunk/src/c/ComputePressurex/ComputePressurex.h
r2333 r3446 9 9 10 10 /* local prototypes: */ 11 void ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters);11 void ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, DataSet* parameters); 12 12 13 13 #endif /* _COMPUTEPRESSUREX_H */ -
issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp
r3420 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 int ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, vertices, DataSet* materials,DataSet* parameters){12 int ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,DataSet* parameters){ 13 13 14 14 int noerr=1; … … 24 24 //_printf_(" Configuring nodes...\n"); 25 25 nodes->Configure(elements,loads,nodes,vertices,materials,parameters); 26 //_printf_(" Configuring vertices...\n");27 vertices->Configure(elements,loads,vertices,materials,parameters);28 26 //_printf_(" Configuring parameters...\n"); 29 27 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); -
issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp
r3332 r3446 11 11 #include "../SurfaceAreax/SurfaceAreax.h" 12 12 13 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials,DataSet* parameters,13 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,DataSet* parameters, 14 14 ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 15 15 … … 23 23 24 24 /*First, get elements and loads configured: */ 25 elements->Configure(elements,loads, nodes, materials,parameters);26 parameters->Configure(elements,loads, nodes, materials,parameters);25 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 26 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 27 27 28 28 /*If fit=3, compute Surface Area*/ … … 30 30 if (fit==3 && !inputs->IsPresent("surfacearea")){ 31 31 32 SurfaceAreax(&S,elements,nodes, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);32 SurfaceAreax(&S,elements,nodes,vertices,loads,materials,parameters,inputs,analysis_type,sub_analysis_type); 33 33 inputs->Add("surfacearea",S); 34 34 } -
issm/trunk/src/c/CostFunctionx/CostFunctionx.h
r3169 r3446 7 7 8 8 #include "../DataSet/DataSet.h" 9 #include "../objects/objects.h" 9 10 10 11 /* local prototypes: */ 11 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 12 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 13 14 -
issm/trunk/src/c/DataSet/DataSet.cpp
r3420 r3446 1650 1650 } 1651 1651 /*}}}*/ 1652 /*FUNCTION DataSet::Update NodePositions{{{1*/1653 void DataSet::Update NodePositions(double* thickness,double* bed){1654 1655 vector<Object*>::iterator object; 1656 Node* node=NULL;1657 1658 for ( object=objects.begin() ; object < objects.end(); object++ ){ 1659 1660 if((*object)->Enum()== NodeEnum()){1661 1662 node=(Node*)(*object);1663 node->UpdateNodePosition(thickness,bed);1664 } 1665 } 1666 } 1667 /*}}}*/ 1652 /*FUNCTION DataSet::UpdateVertexPositions{{{1*/ 1653 void DataSet::UpdateVertexPositions(double* thickness,double* bed){ 1654 1655 vector<Object*>::iterator object; 1656 Vertex* vertex=NULL; 1657 1658 for ( object=objects.begin() ; object < objects.end(); object++ ){ 1659 1660 if((*object)->Enum()==VertexEnum()){ 1661 1662 vertex=(Vertex*)(*object); 1663 vertex->UpdatePosition(thickness,bed); 1664 } 1665 } 1666 } 1667 /*}}}*/ -
issm/trunk/src/c/DataSet/DataSet.h
r3420 r3446 94 94 int FindResult(void* pvalue, char* name); 95 95 void FieldExtrude(Vec field,double* field_serial,char* field_name, int collapse); 96 void Update NodePositions(double* thickness,double* bed);96 void UpdateVertexPositions(double* thickness,double* bed); 97 97 void OutputRifts(Vec riftproperties); 98 98 /*}}}*/ -
issm/trunk/src/c/Dofx/Dofx.h
r3417 r3446 7 7 8 8 #include "../DataSet/DataSet.h" 9 #include "../objects/objects.h" 9 10 10 11 /* local prototypes: */ -
issm/trunk/src/c/Dux/Dux.cpp
r3332 r3446 11 11 #include "../SurfaceAreax/SurfaceAreax.h" 12 12 13 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,13 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 14 14 ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 15 15 … … 25 25 26 26 /*First, get elements and loads configured: */ 27 elements->Configure(elements,loads, nodes, materials,parameters);28 parameters->Configure(elements,loads, nodes, materials,parameters);27 elements->Configure(elements,loads, nodes, vertices, materials,parameters); 28 parameters->Configure(elements,loads, nodes, vertices, materials,parameters); 29 29 30 30 /*If fit=3, compute Surface Area*/ … … 32 32 if (fit==3 && !inputs->IsPresent("surfacearea")){ 33 33 34 SurfaceAreax(&S,elements,nodes, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);34 SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters,inputs,analysis_type,sub_analysis_type); 35 35 inputs->Add("surfacearea",S); 36 36 } -
issm/trunk/src/c/Dux/Dux.h
r2333 r3446 6 6 #define _DUX_H 7 7 8 #include "../objects/objects.h" 8 9 #include "../DataSet/DataSet.h" 9 10 10 11 /* local prototypes: */ 11 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 12 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 13 14 -
issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp
r3372 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void FieldAverageOntoVerticesx( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname){12 void FieldAverageOntoVerticesx( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname){ 13 13 14 14 double* field_serial=NULL; 15 15 16 16 /*First, get elements and nodes configured: */ 17 elements->Configure(elements,loads, nodes, materials,parameters);18 nodes->Configure(elements,loads, nodes, materials,parameters);19 parameters->Configure(elements,loads, nodes, materials,parameters);17 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 18 nodes->Configure(elements,loads, nodes,vertices, materials,parameters); 19 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 20 20 21 21 /*Serialize field: */ -
issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h
r3372 r3446 9 9 10 10 /* local prototypes: */ 11 void FieldAverageOntoVerticesx( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname);11 void FieldAverageOntoVerticesx( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname); 12 12 13 13 #endif /* _FIELDDEPTHAVERAGEX_H */ -
issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void FieldDepthAveragex( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname){12 void FieldDepthAveragex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname){ 13 13 14 14 double* field_serial=NULL; 15 15 16 16 /*First, get elements and nodes configured: */ 17 elements->Configure(elements,loads, nodes, materials,parameters);18 nodes->Configure(elements,loads, nodes, materials,parameters);19 parameters->Configure(elements,loads, nodes, materials,parameters);17 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 18 nodes->Configure(elements,loads, nodes,vertices, materials,parameters); 19 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 20 20 21 21 /*Serialize field: */ -
issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.h
r2333 r3446 9 9 10 10 /* local prototypes: */ 11 void FieldDepthAveragex( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname);11 void FieldDepthAveragex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* fieldname); 12 12 13 13 #endif /* _FIELDDEPTHAVERAGEX_H */ -
issm/trunk/src/c/FieldExtrudex/FieldExtrudex.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void FieldExtrudex( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* field_name,int collapse){12 void FieldExtrudex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* field_name,int collapse){ 13 13 14 14 double* field_serial=NULL; 15 15 16 16 /*First, get elements and nodes configured: */ 17 elements->Configure(elements,loads, nodes, materials,parameters);18 nodes->Configure(elements,loads, nodes, materials,parameters);19 parameters->Configure(elements,loads, nodes, materials,parameters);17 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 18 nodes->Configure(elements,loads, nodes,vertices, materials,parameters); 19 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 20 20 21 21 /*Serialize field: */ -
issm/trunk/src/c/FieldExtrudex/FieldExtrudex.h
r2333 r3446 9 9 10 10 /* local prototypes: */ 11 void FieldExtrudex( Vec field, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,char* field_name, int collapse);11 void FieldExtrudex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,char* field_name, int collapse); 12 12 13 13 #endif /* _FIELDEXTRUDEX_H */ -
issm/trunk/src/c/Gradjx/Gradjx.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void Gradjx( Vec* pgrad_g, int numberofnodes, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void Gradjx( Vec* pgrad_g, int numberofnodes, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 13 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type,char* control_type){ 14 14 … … 17 17 18 18 /*First, get elements and loads configured: */ 19 elements->Configure(elements,loads, nodes, materials,parameters);20 parameters->Configure(elements,loads, nodes, materials,parameters);19 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 20 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 21 21 22 22 /*Allocate grad_g: */ -
issm/trunk/src/c/Gradjx/Gradjx.h
r2333 r3446 7 7 8 8 #include "../DataSet/DataSet.h" 9 #include "../objects/objects.h" 9 10 10 11 /* local prototypes: */ 11 void Gradjx( Vec* pgrad_g, int numberofnodes, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void Gradjx( Vec* pgrad_g, int numberofnodes, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 12 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type,char* control_type); 13 14 -
issm/trunk/src/c/Makefile.am
r3417 r3446 270 270 ./UpdateGeometryx/UpdateGeometryx.h\ 271 271 ./UpdateGeometryx/UpdateGeometryx.cpp\ 272 ./Update NodePositionsx/UpdateNodePositionsx.h\273 ./Update NodePositionsx/UpdateNodePositionsx.cpp\272 ./UpdateVertexPositionsx/UpdateVertexPositionsx.h\ 273 ./UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\ 274 274 ./ConfigureObjectsx/ConfigureObjectsx.h\ 275 275 ./ConfigureObjectsx/ConfigureObjectsx.cpp\ … … 666 666 ./UpdateGeometryx/UpdateGeometryx.h\ 667 667 ./UpdateGeometryx/UpdateGeometryx.cpp\ 668 ./Update NodePositionsx/UpdateNodePositionsx.h\669 ./Update NodePositionsx/UpdateNodePositionsx.cpp\668 ./UpdateVertexPositionsx/UpdateVertexPositionsx.h\ 669 ./UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\ 670 670 ./ConfigureObjectsx/ConfigureObjectsx.h\ 671 671 ./ConfigureObjectsx/ConfigureObjectsx.cpp\ -
issm/trunk/src/c/MassFluxx/MassFluxx.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials,DataSet* parameters, double* segments,int num_segments,double* ug){12 void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials,DataSet* parameters, double* segments,int num_segments,double* ug){ 13 13 14 14 int i,j; … … 24 24 25 25 /*First, get elements and loads configured: */ 26 elements->Configure(elements,loads, nodes, materials,parameters);27 loads->Configure(elements, loads, nodes, materials,parameters);28 parameters->Configure(elements,loads, nodes, materials,parameters);26 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 27 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 28 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 29 29 30 30 /*Go through segments, and then elements, and figure out which elements belong to a segment. -
issm/trunk/src/c/MassFluxx/MassFluxx.h
r2333 r3446 10 10 11 11 /* local prototypes: */ 12 void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials, DataSet* parameters,double* segments,int num_segments,double* ug);12 void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, DataSet* parameters,double* segments,int num_segments,double* ug); 13 13 14 14 -
issm/trunk/src/c/Misfitx/Misfitx.cpp
r3332 r3446 11 11 #include "../SurfaceAreax/SurfaceAreax.h" 12 12 13 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials,DataSet* parameters,13 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,DataSet* parameters, 14 14 ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 15 15 … … 23 23 24 24 /*First, get elements and loads configured: */ 25 elements->Configure(elements,loads, nodes, materials,parameters);26 parameters->Configure(elements,loads, nodes, materials,parameters);25 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 26 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 27 27 28 28 /*If fit=3, compute Surface Area*/ … … 30 30 if (fit==3 && !inputs->IsPresent("surfacearea")){ 31 31 32 SurfaceAreax(&S,elements,nodes, loads,materials,parameters,inputs,analysis_type,sub_analysis_type);32 SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters,inputs,analysis_type,sub_analysis_type); 33 33 inputs->Add("surfacearea",S); 34 34 } -
issm/trunk/src/c/Misfitx/Misfitx.h
r3169 r3446 7 7 8 8 #include "../DataSet/DataSet.h" 9 #include "../objects/objects.h" 9 10 10 11 /* local prototypes: */ 11 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 12 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 13 14 -
issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp
r3439 r3446 40 40 #ifdef _PARALLEL_ 41 41 /*keep only this partition's nodes:*/ 42 if((iomodel->my_ grids[i]==1)){42 if((iomodel->my_vertices[i]==1)){ 43 43 #endif 44 44 … … 57 57 58 58 #ifdef _PARALLEL_ 59 } //if((my_ grids[i]==1))59 } //if((my_vertices[i]==1)) 60 60 #endif 61 61 } -
issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp
r3439 r3446 48 48 #ifdef _PARALLEL_ 49 49 /*keep only this partition's nodes:*/ 50 if((iomodel->my_ grids[i])){50 if((iomodel->my_vertices[i])){ 51 51 #endif 52 52 … … 73 73 74 74 #ifdef _PARALLEL_ 75 } //if((my_ grids[i]))75 } //if((my_vertices[i])) 76 76 #endif 77 77 } -
issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp
r3439 r3446 41 41 #ifdef _PARALLEL_ 42 42 /*keep only this partition's nodes:*/ 43 if((iomodel->my_ grids[i]==1)){43 if((iomodel->my_vertices[i]==1)){ 44 44 #endif 45 45 … … 77 77 78 78 #ifdef _PARALLEL_ 79 } //if((my_ grids[i]==1))79 } //if((my_vertices[i]==1)) 80 80 #endif 81 81 } -
issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp
r3442 r3446 86 86 #ifdef _PARALLEL_ 87 87 /*keep only this partition's nodes:*/ 88 if((iomodel->my_ grids[i]==1)){88 if((iomodel->my_vertices[i]==1)){ 89 89 #endif 90 90 … … 103 103 } 104 104 #ifdef _PARALLEL_ 105 } //if((iomodel->my_ grids[i]==1))105 } //if((iomodel->my_vertices[i]==1)) 106 106 #endif 107 107 } -
issm/trunk/src/c/ModelProcessorx/IoModel.h
r3417 r3446 180 180 bool* my_vertices; 181 181 bool* my_nodes; 182 double*my_bordervertices;182 bool* my_bordervertices; 183 183 int* penaltypartitioning; 184 184 … … 273 273 274 274 /*partitioning: */ 275 void Partitioning(bool** pmy_elements, bool** pmy_vertices, bool** pmy_nodes, double** pmy_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle);275 void Partitioning(bool** pmy_elements, bool** pmy_vertices, bool** pmy_nodes, bool** pmy_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle); 276 276 277 277 #endif /* _IOMODEL_H */ -
issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp
r3439 r3446 52 52 #ifdef _PARALLEL_ 53 53 /*keep only this partition's nodes:*/ 54 if((iomodel->my_ grids[i]==1)){54 if((iomodel->my_vertices[i]==1)){ 55 55 #endif 56 56 … … 71 71 } 72 72 #ifdef _PARALLEL_ 73 } //if((iomodel->my_ grids[i]==1))73 } //if((iomodel->my_vertices[i]==1)) 74 74 #endif 75 75 } -
issm/trunk/src/c/ModelProcessorx/Partitioning.cpp
r3420 r3446 15 15 #include "../include/macros.h" 16 16 #include "../include/typedefs.h" 17 #include "../MeshPartitionx/MeshPartitionx.h" 17 18 18 19 void DiscontinuousGalerkinPartitioning(bool** pmy_elements, bool** pmy_vertices, bool** pmy_nodes, bool** pmy_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle); … … 135 136 my_bordervertices=(bool*)xcalloc(iomodel->numberofvertices,sizeof(bool)); 136 137 for(i=0;i<iomodel->numberofvertices;i++){ 137 if(serial_bordervertices >1)my_bordervertices[i]=1;138 if(serial_bordervertices[i]>1)my_bordervertices[i]=1; 138 139 } 139 140 #else -
issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp
r3439 r3446 41 41 #ifdef _PARALLEL_ 42 42 /*keep only this partition's nodes:*/ 43 if((iomodel->my_ grids[i]==1)){43 if((iomodel->my_vertices[i]==1)){ 44 44 #endif 45 45 … … 59 59 60 60 #ifdef _PARALLEL_ 61 } //if((my_ grids[i]==1))61 } //if((my_vertices[i]==1)) 62 62 #endif 63 63 } -
issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp
r3436 r3446 21 21 int second_count; 22 22 23 int* epart=NULL;24 23 int* part=NULL; 25 24 double* dpart=NULL; 26 int elements_width;27 25 28 26 char** responsedescriptors=NULL; … … 173 171 174 172 175 /*partition grids in iomodel->qmu_npart parts, unless a partition is already present: */173 /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */ 176 174 IoModelFetchData(&dpart,NULL,NULL,iomodel_handle,"part"); 177 175 178 176 if(!dpart){ 179 177 180 if(strcmp(iomodel->meshtype,"2d")==0){ 181 IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements"); 182 elements_width=3; //tria elements 183 } 184 else{ 185 IoModelFetchData(&iomodel->elements2d,NULL,NULL,iomodel_handle,"elements2d"); 186 elements_width=6; //penta elements 187 } 188 189 MeshPartitionx(&epart, &part,iomodel->numberofelements,iomodel->numberofvertices,iomodel->elements, iomodel->numberofelements2d,iomodel->numberofvertices2d,iomodel->elements2d,iomodel->numlayers,elements_width, iomodel->meshtype,iomodel->qmu_npart); 178 /*Partition elements and vertices and nodes: */ 179 Partitioning(&iomodel->my_elements, &iomodel->my_vertices, &iomodel->my_nodes, &iomodel->my_bordervertices, iomodel, iomodel_handle); 190 180 191 181 dpart=(double*)xmalloc(iomodel->numberofvertices*sizeof(double)); 192 for(i=0;i<iomodel->numberofvertices;i++)dpart[i]= part[i];182 for(i=0;i<iomodel->numberofvertices;i++)dpart[i]=iomodel->my_vertices[i]; 193 183 } 194 184 … … 235 225 236 226 /*Only if partitioning exist do we care about the segments: */ 237 if(iomodel-> epart){227 if(iomodel->my_elements){ 238 228 239 229 /*Use the element partitioning vector from the iomodel to down select qmu_mass_flux_segments to only segments that are relevant … … 241 231 my_num_qmu_mass_flux_segments=0; 242 232 for(j=0;j<num_qmu_mass_flux_segments;j++){ 243 if ( iomodel-> epart[(int)(*(qmu_mass_flux_segments+5*j+4))-1] == my_rank)my_num_qmu_mass_flux_segments++;233 if ( iomodel->my_elements[(int)(*(qmu_mass_flux_segments+5*j+4))-1])my_num_qmu_mass_flux_segments++; 244 234 } 245 235 … … 249 239 second_count=0; 250 240 for(j=0;j<num_qmu_mass_flux_segments;j++){ 251 if (iomodel-> epart[(int)*(qmu_mass_flux_segments+5*j+4)-1]==my_rank){241 if (iomodel->my_elements[(int)*(qmu_mass_flux_segments+5*j+4)-1]){ 252 242 for(k=0;k<5;k++)*(my_qmu_mass_flux_segments+5*second_count+k)=*(qmu_mass_flux_segments+5*j+k); 253 243 second_count++; … … 321 311 xfree((void**)&iomodel->elements); 322 312 xfree((void**)&iomodel->elements2d); 323 xfree((void**)&epart);324 313 xfree((void**)&part); 325 314 xfree((void**)&dpart); -
issm/trunk/src/c/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp
r3439 r3446 43 43 #ifdef _PARALLEL_ 44 44 /*keep only this partition's nodes:*/ 45 if((iomodel->my_ grids[i]==1)){45 if((iomodel->my_vertices[i]==1)){ 46 46 #endif 47 47 -
issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp
r3439 r3446 53 53 #ifdef _PARALLEL_ 54 54 /*keep only this partition's nodes:*/ 55 if((iomodel->my_ grids[i]==1)){55 if((iomodel->my_vertices[i]==1)){ 56 56 #endif 57 57 … … 72 72 } 73 73 #ifdef _PARALLEL_ 74 } //if((iomodel->my_ grids[i]==1))74 } //if((iomodel->my_vertices[i]==1)) 75 75 #endif 76 76 } -
issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp
r3332 r3446 11 11 #include "../EnumDefinitions/EnumDefinitions.h" 12 12 13 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, 13 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, DataSet* vertices, 14 14 DataSet* loads,DataSet* materials, DataSet* parameters,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 15 15 … … 28 28 29 29 /*First, get loads configured: */ 30 loads->Configure(elements, loads, nodes, materials,parameters);30 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 31 31 32 32 /*Do we have penalties linked to rifts? In this case, run our special rifts penalty -
issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.h
r2333 r3446 10 10 11 11 /* local prototypes: */ 12 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, 12 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, DataSet* vertices, 13 13 DataSet* loads,DataSet* materials, DataSet* parameters,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 14 14 -
issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials, DataSet* parameters,12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, DataSet* parameters, 13 13 int kflag,int pflag,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 14 14 … … 20 20 21 21 /*First, get elements and loads configured: */ 22 elements->Configure(elements,loads, nodes, materials,parameters);23 loads->Configure(elements, loads, nodes, materials,parameters);24 parameters->Configure(elements,loads, nodes, materials,parameters);22 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 23 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 24 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 25 25 26 26 /*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */ -
issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.h
r2333 r3446 10 10 11 11 /* local prototypes: */ 12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax, DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials, DataSet* parameters,12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, DataSet* parameters, 13 13 int kflag,int pflag,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 14 14 -
issm/trunk/src/c/Qmux/DakotaResponses.cpp
r3332 r3446 263 263 264 264 /*Compute misfit: */ 265 Misfitx( &J, femmodel->elements,femmodel->nodes, femmodel-> loads, femmodel->materials, femmodel->parameters,inputs,analysis_type,sub_analysis_type);265 Misfitx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,inputs,analysis_type,sub_analysis_type); 266 266 267 267 … … 317 317 318 318 /*call mass flux module: */ 319 MassFluxx(&mass_flux,femmodel->elements,femmodel->nodes,femmodel-> loads,femmodel->materials,femmodel->parameters,segments,num_segments,ug_serial);319 MassFluxx(&mass_flux,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,segments,num_segments,ug_serial); 320 320 321 321 if(my_rank==0)responses[i]=mass_flux; -
issm/trunk/src/c/Qmux/Qmux.h
r3042 r3446 7 7 8 8 #include "../DataSet/DataSet.h" 9 #include "../objects/objects.h" 9 10 10 11 /* local prototypes: */ -
issm/trunk/src/c/SpcNodesx/SpcNodesx.h
r2316 r3446 6 6 #define _SPCNODESX_H 7 7 8 #include "../objects/objects.h" 8 9 #include "../DataSet/DataSet.h" 9 10 #include "../toolkits/toolkits.h" 10 11 11 12 /* local prototypes: */ 12 void 13 void SpcNodesx( DofVec** pyg, DataSet* nodesin,DataSet* constraints); 13 14 14 15 #endif /* _SPCNODESX_H */ -
issm/trunk/src/c/SurfaceAreax/SurfaceAreax.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials,DataSet* parameters,12 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,DataSet* parameters, 13 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 14 14 … … 18 18 19 19 /*First, get elements and loads configured: */ 20 elements->Configure(elements,loads, nodes, materials,parameters);21 parameters->Configure(elements,loads, nodes, materials,parameters);20 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 21 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 22 22 23 23 /*Compute gradients: */ -
issm/trunk/src/c/SurfaceAreax/SurfaceAreax.h
r3180 r3446 6 6 #define _SURFACEAREAX_H 7 7 8 #include "../objects/objects.h" 8 9 #include "../DataSet/DataSet.h" 9 10 10 11 /* local prototypes: */ 11 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,12 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters, 12 13 ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 13 14 -
issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials, DataSet* parameters,12 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, DataSet* parameters, 13 13 int kflag,int pflag,int connectivity,int numberofdofspernode,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ 14 14 … … 26 26 27 27 /*First, get elements and loads configured: */ 28 elements->Configure(elements,loads, nodes, materials,parameters);29 loads->Configure(elements, loads, nodes, materials,parameters);30 parameters->Configure(elements,loads, nodes, materials,parameters);28 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 29 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 30 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 31 31 32 32 /*Get size of matrix: */ -
issm/trunk/src/c/SystemMatricesx/SystemMatricesx.h
r2333 r3446 10 10 11 11 /* local prototypes: */ 12 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* loads,DataSet* materials, DataSet* parameters,12 void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, DataSet* parameters, 13 13 int kflag,int pflag,int connectivity,int numberofdofspernode,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); 14 14 -
issm/trunk/src/c/UpdateFromInputsx/UpdateFromInputsx.cpp
r3332 r3446 10 10 #include "../EnumDefinitions/EnumDefinitions.h" 11 11 12 int UpdateFromInputsx( DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,ParameterInputs* inputs) {12 int UpdateFromInputsx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, DataSet* parameters,ParameterInputs* inputs) { 13 13 14 14 int noerr=1; … … 20 20 21 21 /*First, get elements and loads configured: */ 22 elements->Configure(elements,loads, nodes, materials,parameters);23 loads->Configure(elements, loads, nodes, materials,parameters);24 nodes->Configure(elements, loads, nodes, materials,parameters);25 parameters->Configure(elements,loads, nodes, materials,parameters);22 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 23 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 24 nodes->Configure(elements, loads, nodes,vertices, materials,parameters); 25 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 26 26 27 27 /*Update elements, nodes, loads and materials from inputs: */ -
issm/trunk/src/c/UpdateFromInputsx/UpdateFromInputsx.h
r2333 r3446 6 6 #define _UPDATEFROMINPUTSXX_H 7 7 8 #include "../objects/objects.h" 8 9 #include "../DataSet/DataSet.h" 9 #include "../objects/ParameterInputs.h"10 10 11 11 /* local prototypes: */ 12 int UpdateFromInputsx( DataSet* elements,DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,ParameterInputs* inputs);12 int UpdateFromInputsx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, DataSet* parameters,ParameterInputs* inputs); 13 13 14 14 #endif /* _UPDATEFROMINPUTSXX_H */ -
issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.cpp
r3332 r3446 12 12 13 13 void UpdateGeometryx(Vec* poutthickness,Vec* poutbed,Vec* poutsurface, 14 DataSet* elements, DataSet* nodes, DataSet* loads, DataSet* materials, DataSet* parameters,14 DataSet* elements, DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, DataSet* parameters, 15 15 Vec vec_newthickness,Vec vec_bed,Vec vec_surface){ 16 16 … … 43 43 44 44 /*First, get elements and loads configured: */ 45 elements->Configure(elements,loads, nodes, materials,parameters);46 materials->Configure(elements, loads, nodes, materials,parameters);47 loads->Configure(elements, loads, nodes, materials,parameters);48 parameters->Configure(elements,loads, nodes, materials,parameters);45 elements->Configure(elements,loads, nodes,vertices, materials,parameters); 46 materials->Configure(elements, loads, nodes,vertices, materials,parameters); 47 loads->Configure(elements, loads, nodes,vertices, materials,parameters); 48 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 49 49 50 50 /*Serialize inputs :*/ -
issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.h
r2333 r3446 11 11 /* local prototypes: */ 12 12 void UpdateGeometryx(Vec* poutthickness,Vec* poutbed,Vec* poutsurface, 13 DataSet* elements, DataSet* nodes,DataSet* loads, DataSet* materials, DataSet* parameters,13 DataSet* elements, DataSet* nodes,DataSet* vertices,DataSet* loads, DataSet* materials, DataSet* parameters, 14 14 Vec newthickness,Vec bed,Vec surface); 15 15 -
issm/trunk/src/c/issm.h
r3372 r3446 41 41 #include "./UpdateFromInputsx/UpdateFromInputsx.h" 42 42 #include "./UpdateGeometryx/UpdateGeometryx.h" 43 #include "./Update NodePositionsx/UpdateNodePositionsx.h"43 #include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h" 44 44 #include "./PenaltySystemMatricesx/PenaltySystemMatricesx.h" 45 45 #include "./Reducematrixfromgtofx/Reducematrixfromgtofx.h" -
issm/trunk/src/c/objects/ElementProperties.cpp
r3420 r3446 44 44 this->thermal_steadystate=0; 45 45 return; 46 } 47 /*}}}*/ 48 /*FUNCTION ElementProperties copy constructor {{{1*/ 49 ElementProperties::ElementProperties(ElementProperties* in){ 50 51 int i; 52 53 this->numnodes=in->numnodes; 54 55 if(in->h){ 56 this->h=(double*)xmalloc(this->numnodes*sizeof(double)); 57 for(i=0;i<this->numnodes;i++)this->h[i]=in->h[i]; 58 } 59 else this->h=NULL; 60 61 this->numnodes=in->numnodes; 62 if(in->s){ 63 this->s=(double*)xmalloc(this->numnodes*sizeof(double)); 64 for(i=0;i<this->numnodes;i++)this->s[i]=in->s[i]; 65 } 66 else this->s=NULL; 67 68 69 this->numnodes=in->numnodes; 70 if(in->b){ 71 this->b=(double*)xmalloc(this->numnodes*sizeof(double)); 72 for(i=0;i<this->numnodes;i++)this->b[i]=in->b[i]; 73 } 74 else this->b=NULL; 75 76 77 this->numnodes=in->numnodes; 78 if(in->k){ 79 this->k=(double*)xmalloc(this->numnodes*sizeof(double)); 80 for(i=0;i<this->numnodes;i++)this->k[i]=in->k[i]; 81 } 82 else this->k=NULL; 83 84 85 this->numnodes=in->numnodes; 86 if(in->melting){ 87 this->melting=(double*)xmalloc(this->numnodes*sizeof(double)); 88 for(i=0;i<this->numnodes;i++)this->melting[i]=in->melting[i]; 89 } 90 else this->melting=NULL; 91 92 93 this->numnodes=in->numnodes; 94 if(in->accumulation){ 95 this->accumulation=(double*)xmalloc(this->numnodes*sizeof(double)); 96 for(i=0;i<this->numnodes;i++)this->accumulation[i]=in->accumulation[i]; 97 } 98 else this->accumulation=NULL; 99 100 101 this->numnodes=in->numnodes; 102 if(in->geothermalflux){ 103 this->geothermalflux=(double*)xmalloc(this->numnodes*sizeof(double)); 104 for(i=0;i<this->numnodes;i++)this->geothermalflux[i]=in->geothermalflux[i]; 105 } 106 else this->geothermalflux=NULL; 107 108 109 this->friction_type=in->friction_type; 110 this->p=in->p; 111 this->q=in->q; 112 this->shelf=in->shelf; 113 this->onbed=in->onbed; 114 this->onwater=in->onwater; 115 this->onsurface=in->onsurface; 116 this->collapse=in->collapse; 117 this->thermal_steadystate=in->thermal_steadystate; 118 46 119 } 47 120 /*}}}*/ -
issm/trunk/src/c/objects/Node.cpp
r3442 r3446 278 278 } 279 279 /*}}}*/ 280 /*FUNCTION Node GetDof {{{2*/ 281 int Node::GetDof(int dofindex){ 282 283 return indexing.doflist[dofindex]; 284 285 } 286 /*}}}*/ 287 /*FUNCTION Node GetDofList1{{{2*/ 288 int Node::GetDofList1(void){ 289 290 Vertex* vertex=NULL; 291 292 vertex=(Vertex*)this->hvertex.delivers(); 293 294 return vertex->dof; 295 } 296 /*}}}*/ 297 /*FUNCTION Node GetDofList{{{2*/ 298 void Node::GetDofList(int* outdoflist,int* pnumberofdofspernode){ 299 300 int i; 301 for(i=0;i<this->indexing.numberofdofs;i++){ 302 outdoflist[i]=indexing.doflist[i]; 303 } 304 /*Assign output pointers:*/ 305 *pnumberofdofspernode=this->indexing.numberofdofs; 306 } 307 /*}}}*/ 280 308 /*FUNCTION Node GetId{{{2*/ 281 309 int Node::GetId(void){ return id; } … … 728 756 } 729 757 /*}}}*/ 730 /*FUNCTION Node GetDof {{{2*/731 int Node::GetDof(int dofindex){732 733 return indexing.doflist[dofindex];734 735 }736 /*}}}*/737 /*FUNCTION Node GetDofList{{{2*/738 void Node::GetDofList(int* outdoflist,int* pnumberofdofspernode){739 740 int i;741 for(i=0;i<this->indexing.numberofdofs;i++){742 outdoflist[i]=indexing.doflist[i];743 }744 /*Assign output pointers:*/745 *pnumberofdofspernode=this->indexing.numberofdofs;746 }747 /*}}}*/748 758 /*FUNCTION Node GetNumberOfDofs{{{2*/ 749 759 int Node::GetNumberOfDofs(){ -
issm/trunk/src/c/objects/Node.h
r3439 r3446 93 93 int IsOnSheet(); 94 94 void FieldExtrude(Vec field,double* field_serial,char* field_name); 95 void UpdateNodePosition(double* thickness,double* bed);96 95 /*}}}*/ 97 96 }; -
issm/trunk/src/c/parallel/ControlInitialization.cpp
r3332 r3446 83 83 diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum()); 84 84 diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum()); 85 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopex",0);86 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopey",0);85 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); 86 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0); 87 87 88 88 //Add in inputs … … 97 97 diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum()); 98 98 if(verbose)_printf_("%s\n"," extruding horizontal velocities..."); 99 VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh-> loads,fem_dh-> materials,fem_dh->parameters,"velocity",1);99 VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->vertices,fem_dh->loads,fem_dh-> materials,fem_dh->parameters,"velocity",1); 100 100 101 101 //vertical velocity … … 113 113 //Create 4d u_g 114 114 if(verbose)_printf_("%s\n"," computing pressure according to Pattyn..."); 115 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh-> loads, fem_dh->materials, fem_dh->parameters);115 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->vertices,fem_dh->loads, fem_dh->materials, fem_dh->parameters); 116 116 VecScale(pg,1.0/stokesreconditioning); 117 117 ug_stokes=NewVec(fem_ds->nodesets->GetGSize()); -
issm/trunk/src/c/parallel/OutputResults.cpp
r3332 r3446 12 12 #include "../DataSet/DataSet.h" 13 13 #include "../io/io.h" 14 #include "../objects/objects.h" 14 15 15 16 void OutputResults(DataSet* results,char* filename){ -
issm/trunk/src/c/parallel/balancedthickness_core.cpp
r3332 r3446 44 44 _printf_("depth averaging velocity...\n"); 45 45 u_g=inputs->Get("velocity",&dofs[0],2); //take (vx,vy) from inputs velocity 46 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"velocity");46 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"velocity"); 47 47 inputs->Add("velocity_average",u_g,2,numberofnodes); 48 48 … … 51 51 52 52 _printf_("extrude computed thickness on all layers:\n"); 53 FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"thickness",0);53 FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0); 54 54 55 55 /*Plug results into output dataset: */ -
issm/trunk/src/c/parallel/balancedvelocities_core.cpp
r3332 r3446 43 43 _printf_("depth averaging velocity...\n"); 44 44 u_g=inputs->Get("velocity",&dofs[0],2); //take (vx,vy) from inputs velocity 45 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"velocity");45 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"velocity"); 46 46 inputs->Add("velocity_average",u_g,2,numberofnodes); 47 47 … … 50 50 51 51 _printf_("extrude computed thickness on all layers:\n"); 52 FieldExtrudex( v_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"thickness",0);52 FieldExtrudex( v_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0); 53 53 54 54 /*Plug results into output dataset: */ -
issm/trunk/src/c/parallel/control_core.cpp
r3332 r3446 105 105 106 106 /*Update parameters: */ 107 UpdateFromInputsx(fem_model->elements,fem_model->nodes,fem_model-> loads, fem_model->materials,fem_model->parameters,inputs);107 UpdateFromInputsx(fem_model->elements,fem_model->nodes,fem_model->vertices,fem_model->loads, fem_model->materials,fem_model->parameters,inputs); 108 108 109 109 _printf_("%s\n"," computing gradJ..."); -
issm/trunk/src/c/parallel/diagnostic_core.cpp
r3332 r3446 96 96 97 97 if(verbose)_printf_("%s\n","extruding slopes in 3d..."); 98 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopex",0);99 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopex",0);98 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); 99 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); 100 100 } 101 101 … … 109 109 110 110 if(verbose)_printf_("%s\n"," computing pressure according to MacAyeal..."); 111 ComputePressurex( &pg,fem_dhu->elements,fem_dhu->nodes,fem_dhu-> loads,fem_dhu->materials, fem_dhu->parameters);111 ComputePressurex( &pg,fem_dhu->elements,fem_dhu->nodes,fem_dhu->vertices,fem_dhu->loads,fem_dhu->materials, fem_dhu->parameters); 112 112 113 113 if(verbose)_printf_("%s\n"," update boundary conditions for macyeal pattyn using hutter results..."); … … 127 127 if(dim==2){ 128 128 if(verbose)_printf_("%s\n"," computing pressure according to MacAyeal..."); 129 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh-> loads, fem_dh->materials, fem_dh->parameters);129 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->vertices,fem_dh->loads, fem_dh->materials, fem_dh->parameters); 130 130 } 131 131 … … 136 136 137 137 if(verbose)_printf_("%s\n"," extruding horizontal velocities..."); 138 VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh-> loads,fem_dh->materials,fem_dh->parameters,"velocity",1);138 VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->vertices,fem_dh->loads,fem_dh->materials,fem_dh->parameters,"velocity",1); 139 139 140 140 if(verbose)_printf_("%s\n"," computing vertical velocities..."); … … 150 150 151 151 if(verbose)_printf_("%s\n"," computing pressure according to Pattyn..."); 152 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh-> loads, fem_dh->materials,fem_dh->parameters);152 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->vertices,fem_dh->loads, fem_dh->materials,fem_dh->parameters); 153 153 154 154 if (isstokes){ … … 160 160 diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum()); 161 161 diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum()); 162 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopex",0);163 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl-> loads,fem_sl->materials,fem_sl->parameters,"slopey",0);162 FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); 163 FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0); 164 164 165 165 inputs->Add("bedslopex",slopex,numberofdofspernode_sl,numberofnodes); -
issm/trunk/src/c/parallel/diagnostic_core_linear.cpp
r3332 r3446 34 34 35 35 /*Update parameters: */ 36 UpdateFromInputsx(fem->elements,fem->nodes,fem-> loads, fem->materials,fem->parameters,inputs);36 UpdateFromInputsx(fem->elements,fem->nodes,fem->vertices,fem->loads, fem->materials,fem->parameters,inputs); 37 37 38 38 //*Generate system matrices 39 39 if (verbose) _printf_(" Generating matrices\n"); 40 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);40 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 41 41 42 42 if (verbose) _printf_(" Generating penalty matrices\n"); 43 //*Generate penalty system matrices44 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);43 //*Generate penalty system matrices 44 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type); 45 45 46 46 /*!Reduce matrix from g to f size:*/ -
issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp
r3332 r3446 80 80 81 81 /*Update parameters: */ 82 UpdateFromInputsx(fem->elements,fem->nodes, loads, fem->materials,fem->parameters,inputs);82 UpdateFromInputsx(fem->elements,fem->nodes,fem->vertices,loads, fem->materials,fem->parameters,inputs); 83 83 84 84 if (verbose) _printf_(" Generating matrices\n"); 85 85 //*Generate system matrices 86 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes, loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);86 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 87 87 88 88 if (verbose) _printf_(" Generating penalty matrices\n"); 89 89 //*Generate penalty system matrices 90 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes, loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);90 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type); 91 91 92 92 if (verbose) _printf_(" reducing matrix from g to f set\n"); … … 117 117 if (old_ug) inputs->Add("old_velocity",old_ug,numberofdofspernode,numberofnodes); 118 118 inputs->Add("velocity",ug,numberofdofspernode,numberofnodes); 119 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes, loads,fem->materials,fem->parameters,inputs,analysis_type,sub_analysis_type);119 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,inputs,analysis_type,sub_analysis_type); 120 120 121 121 //if(verbose)_printf_(" number of unstable constraints: %i\n",num_unstable_constraints); … … 156 156 kflag=1; pflag=0; //stiffness generation only 157 157 158 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes, loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);158 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 159 159 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets); 160 160 MatFree(&Kgg);VecFree(&pg); -
issm/trunk/src/c/parallel/gradjcompute_core.cpp
r3332 r3446 67 67 68 68 _printf_("%s\n"," buid Du, difference between observed velocity and model velocity:"); 69 Dux( &du_g, femmodel->elements,femmodel->nodes,femmodel-> loads,femmodel->materials,femmodel->parameters,inputs,analysis_type,sub_analysis_type);69 Dux( &du_g, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,inputs,analysis_type,sub_analysis_type); 70 70 71 71 _printf_("%s\n"," reduce adjoint load from g-set to f-set:"); … … 85 85 inputs->Add("adjoint",lambda_g_double,numberofdofspernode,numberofnodes); 86 86 87 Gradjx( &grad_g, numberofnodes,femmodel->elements,femmodel->nodes, femmodel-> loads, femmodel->materials,femmodel->parameters,87 Gradjx( &grad_g, numberofnodes,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, 88 88 inputs,analysis_type,sub_analysis_type,control_type); 89 89 … … 91 91 92 92 _printf_("%s\n"," extruding gradient..."); 93 FieldExtrudex( grad_g, femmodel->elements,femmodel->nodes,femmodel-> loads,femmodel->materials,femmodel->parameters,"gradj",0);93 FieldExtrudex( grad_g, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"gradj",0); 94 94 } 95 95 -
issm/trunk/src/c/parallel/objectivefunctionC.cpp
r3332 r3446 94 94 /*Compute misfit for this velocity field.*/ 95 95 inputs->Add("fit",fit[n]); 96 CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel-> loads, femmodel->materials, femmodel->parameters,inputs,analysis_type,sub_analysis_type);96 CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters,inputs,analysis_type,sub_analysis_type); 97 97 98 98 /*Free ressources:*/ -
issm/trunk/src/c/parallel/prognostic2_core.cpp
r3378 r3446 44 44 vx_g=inputs->Get("vx",&dofs[0],1); 45 45 vy_g=inputs->Get("vy",&dofs[0],1); 46 FieldDepthAveragex(vx_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"vx");47 FieldDepthAveragex(vy_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"vy");46 FieldDepthAveragex(vx_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"vx"); 47 FieldDepthAveragex(vy_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"vy"); 48 48 inputs->Add("vx_average",vx_g,1,numberofnodes); 49 49 inputs->Add("vy_average",vy_g,1,numberofnodes); … … 53 53 54 54 _printf_("extrude computed thickness on all layers:\n"); 55 //FieldAverageOntoVertices(h_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"thickness",0);55 //FieldAverageOntoVertices(h_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0); 56 56 57 57 /*Plug results into output dataset: */ -
issm/trunk/src/c/parallel/prognostic_core.cpp
r3332 r3446 43 43 _printf_("depth averaging velocity...\n"); 44 44 u_g=inputs->Get("velocity",&dofs[0],2); //take (vx,vy) from inputs velocity 45 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"velocity");45 FieldDepthAveragex( u_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"velocity"); 46 46 inputs->Add("velocity_average",u_g,2,numberofnodes); 47 47 … … 50 50 51 51 _printf_("extrude computed thickness on all layers:\n"); 52 FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p-> loads, fem_p->materials,fem_p->parameters,"thickness",0);52 FieldExtrudex( h_g, fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,"thickness",0); 53 53 54 54 /*Plug results into output dataset: */ -
issm/trunk/src/c/parallel/slopecompute_core.cpp
r3332 r3446 43 43 44 44 _printf_("extrude computed slope on all layers:\n"); 45 FieldExtrudex( sx_g, fem_sl->elements,fem_sl->nodes, fem_sl-> loads, fem_sl->materials,fem_sl->parameters,"slopex",0);46 FieldExtrudex( sy_g, fem_sl->elements,fem_sl->nodes, fem_sl-> loads, fem_sl->materials,fem_sl->parameters,"slopey",0);45 FieldExtrudex( sx_g, fem_sl->elements,fem_sl->nodes, fem_sl->vertices,fem_sl->loads, fem_sl->materials,fem_sl->parameters,"slopex",0); 46 FieldExtrudex( sy_g, fem_sl->elements,fem_sl->nodes, fem_sl->vertices,fem_sl->loads, fem_sl->materials,fem_sl->parameters,"slopey",0); 47 47 48 48 /*Plug results into output dataset: */ -
issm/trunk/src/c/parallel/steadystate_core.cpp
r3332 r3446 92 92 //compute depth averaged temperature and add to inputs 93 93 VecDuplicatePatch(&t_g_average,t_g); 94 FieldDepthAveragex( t_g_average, fem_t->elements,fem_t->nodes, fem_t-> loads, fem_t->materials,fem_t->parameters,"temperature");94 FieldDepthAveragex( t_g_average, fem_t->elements,fem_t->nodes, fem_t->vertices,fem_t->loads, fem_t->materials,fem_t->parameters,"temperature"); 95 95 inputs->Add("temperature_average",t_g_average,1,numberofnodes); 96 96 inputs->Add("temperature",t_g,1,numberofnodes); -
issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp
r3332 r3446 60 60 61 61 /*Update parameters: */ 62 UpdateFromInputsx(fem->elements,fem->nodes,fem-> loads, fem->materials,fem->parameters,inputs);62 UpdateFromInputsx(fem->elements,fem->nodes,fem->vertices,fem->loads, fem->materials,fem->parameters,inputs); 63 63 64 64 //*Generate system matrices … … 67 67 /*Compute Kgg_nopenalty and pg_nopenalty once for all: */ 68 68 if (count==1){ 69 SystemMatricesx(&Kgg_nopenalty, &pg_nopenalty,fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);69 SystemMatricesx(&Kgg_nopenalty, &pg_nopenalty,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 70 70 } 71 71 … … 75 75 76 76 //apply penalties each time 77 PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);77 PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type); 78 78 } 79 79 else{ 80 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type);80 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 81 81 //apply penalties 82 PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type);82 PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag,inputs,analysis_type,sub_analysis_type); 83 83 } 84 84 … … 114 114 inputs->Add("temperature",tg,numberofdofspernode,numberofnodes); 115 115 116 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem-> loads,fem->materials,fem->parameters,inputs,analysis_type,sub_analysis_type);116 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,inputs,analysis_type,sub_analysis_type); 117 117 118 118 if (!converged){ -
issm/trunk/src/c/parallel/transient_core_2d.cpp
r3332 r3446 140 140 //update surface and bed using the new thickness 141 141 _printf_(" updating geometry\n"); 142 UpdateGeometryx(&new_h_g,&new_b_g,&new_s_g, fem_p->elements, fem_p->nodes,fem_p-> loads, fem_p->materials, fem_p->parameters,h_g_intermediary,b_g,s_g);142 UpdateGeometryx(&new_h_g,&new_b_g,&new_s_g, fem_p->elements, fem_p->nodes,fem_p->vertices,fem_p->loads, fem_p->materials, fem_p->parameters,h_g_intermediary,b_g,s_g); 143 143 144 144 VecFree(&h_g);h_g=new_h_g; -
issm/trunk/src/c/parallel/transient_core_3d.cpp
r3333 r3446 143 143 if(verbose)_printf_("%s\n","computing depth average temperature"); 144 144 VecDuplicatePatch(&t_g_average,t_g); 145 FieldDepthAveragex( t_g_average, fem_t->elements,fem_t->nodes, fem_t-> loads, fem_t->materials,fem_t->parameters,"temperature");145 FieldDepthAveragex( t_g_average, fem_t->elements,fem_t->nodes, fem_t->vertices,fem_t->loads, fem_t->materials,fem_t->parameters,"temperature"); 146 146 inputs->Add("temperature_average",t_g_average,1,numberofnodes); 147 147 VecFree(&t_g_average); //not needed anymore … … 168 168 //update surface and bed using the new thickness 169 169 if(verbose)_printf_(" updating geometry\n"); 170 UpdateGeometryx(&h_g,&b_g,&s_g, fem_p->elements, fem_p->nodes, fem_p->loads, fem_p->materials, fem_p->parameters,h_g_intermediary,b_g,s_g);170 UpdateGeometryx(&h_g,&b_g,&s_g, fem_p->elements, fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials, fem_p->parameters,h_g_intermediary,b_g,s_g); 171 171 VecFree(&h_g_intermediary); 172 172 173 173 if(verbose)_printf_("%s\n","updating node positions"); 174 Update NodePositionsx( fem_dh->elements,fem_dh->nodes,fem_dh->loads,fem_dh->materials,fem_dh->parameters,h_g,b_g);175 Update NodePositionsx( fem_dv->elements,fem_dv->nodes,fem_dv->loads,fem_dv->materials,fem_dv->parameters,h_g,b_g);176 Update NodePositionsx( fem_dhu->elements,fem_dhu->nodes,fem_dhu->loads,fem_dhu->materials,fem_dhu->parameters,h_g,b_g);177 Update NodePositionsx( fem_ds->elements,fem_ds->nodes,fem_ds->loads,fem_ds->materials,fem_ds->parameters,h_g,b_g);178 Update NodePositionsx( fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,fem_sl->parameters,h_g,b_g);179 Update NodePositionsx( fem_p->elements,fem_p->nodes,fem_p->loads,fem_p->materials,fem_p->parameters,h_g,b_g);180 Update NodePositionsx( fem_t->elements,fem_t->nodes,fem_t->loads,fem_t->materials,fem_t->parameters,h_g,b_g);181 Update NodePositionsx( fem_m->elements,fem_m->nodes,fem_m->loads,fem_m->materials,fem_m->parameters,h_g,b_g);174 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 175 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 176 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 177 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 178 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 179 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 180 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 181 UpdateVertexPositionsx( fem_dh->vertices,h_g,b_g); 182 182 183 183 //plug into results.
Note:
See TracChangeset
for help on using the changeset viewer.