Index: /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp =================================================================== --- /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 5517) +++ /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 5518) @@ -19,5 +19,5 @@ -void AverageOntoPartitionx(double** average, double* vertex_response, Vertices* vertices, Parameters* parameters,Vec node_partition){ +void AverageOntoPartitionx(double** paverage, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response,Vec vertex_cluster_partition){ int i,j,k; @@ -25,12 +25,18 @@ int qmu_npart; - double *qmu_part_serial = NULL; + double *qmu_part_nocluster = NULL; double *qmu_part = NULL; - double* partition=NULL; //serial version of node_partition + double* partition=NULL; //serial version of vertex_cluster_partition int numberofvertices; - /*First, recover qmu partition of vertices. Careful, do not confuse with node_partition, which is just used to distribute vertices + /*output: */ + Vec partition_contributions=NULL; + Vec partition_areas=NULL; + Vec vec_average=NULL; + double* average=NULL; + + /*First, recover qmu partition of vertices. Careful, do not confuse with vertex_cluster_partition, which is just used to distribute vertices * onto cpus in a cluter: */ - if(!parameters->FindParam(&qmu_part_serial,&dummy,QmuPartEnum))ISSMERROR(" could not find qmu partition vector"); + if(!parameters->FindParam(&qmu_part_nocluster,&dummy,QmuPartEnum))ISSMERROR(" could not find qmu partition vector"); /*Some parameters: */ @@ -38,10 +44,10 @@ parameters->FindParam(&qmu_npart,QmuNPartEnum); - /*serialize nodal partition vector: */ - VecToMPISerial(&partition,node_partition); + /*serialize vertex_cluster_partition: */ + VecToMPISerial(&partition,vertex_cluster_partition); - /*Use partition vector to repartition qmu_part_serial, which is ordered in a serial way: */ + /*Use partition vector to repartition qmu_part_nocluster, which is ordered for use on a serial machine, not a cluster: */ qmu_part=(double*)xmalloc(numberofvertices*sizeof(double)); - for(k=0;kSize();i++){ + Element* element=(Element*)elements->GetObjectByOffset(i); + element->AverageOntoPartition(partition_contributions,partition_areas,vertex_response,qmu_part); + } + /*Assemble: */ + VecAssemblyBegin(partition_contributions); + VecAssemblyEnd(partition_contributions); + + VecAssemblyBegin(partition_areas); + VecAssemblyEnd(partition_areas); + + /*We have the partition_areas and the partition_contributions for each partition -> compute the surfae weighted average: */ + VecPointwiseDivide(vec_average,partition_contributions,partition_areas); + + /*serialize:*/ + VecToMPISerial(&average,vec_average); + + /*Free ressources:*/ + xfree((void**)&partition); + xfree((void**)&qmu_part_nocluster); + xfree((void**)&qmu_part); + VecFree(&partition_contributions); + VecFree(&partition_areas); + VecFree(&vec_average); + + /*Assign output pointers:*/ + *paverage=average; } Index: /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h =================================================================== --- /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h (revision 5517) +++ /issm/trunk/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h (revision 5518) @@ -9,5 +9,5 @@ #include "../../Container/Container.h" -void AverageOntoPartitionx(double** average, double* vertex_response, Vertices* vertices,Parameters* parameters,Vec node_partition); +void AverageOntoPartitionx(double** average, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response,Vec vertex_cluster_partition); #endif /* _AVERAGEONTOPARTITIONXX_H */ Index: /issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 5517) +++ /issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 5518) @@ -18,5 +18,5 @@ -void DakotaResponsesx(double* d_responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,Vec node_partition,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){ +void DakotaResponsesx(double* d_responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,Vec vertex_cluster_partition,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){ int i,j,k; @@ -31,5 +31,5 @@ int flag; double* vertex_response=NULL; - double* partition_response=NULL; + double* qmu_response=NULL; double* responses_pointer=NULL; @@ -54,15 +54,18 @@ /*Now, average it onto the partition grids: */ - AverageOntoPartitionx(&partition_response,vertex_response,vertices,parameters,node_partition); + AverageOntoPartitionx(&qmu_response,elements,nodes,vertices,loads,materials,parameters,vertex_response,vertex_cluster_partition); /*Copy onto our dakota responses: */ - for(i=0;iGetArea(); + + /*Figure out the average for this element: */ + this->GetDofList1(&offset[0]); + mean=0; + for(i=0;i