Changeset 11695 for issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

Timestamp:

03/13/12 19:59:59 (13 years ago)

Author:

Eric.Larour

Message:

Completed separation of Petsc from ISSM. Matrix and Vector
are now the vehicles for Mat and Vec objects when running with
Petsc, or double* when running with a custom made type of matrix (still
to be finished).

File:

• issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

@@ -29 +29 @@
 
         /*output: */
-        Vec partition_contributions=NULL;
-        Vec partition_areas=NULL;
-        Vec vec_average=NULL;
+        Vector* partition_contributions=NULL;
+        Vector* partition_areas=NULL;
+        Vector* vec_average=NULL;
         double* average=NULL;
 
@@ -44 +44 @@
 
         /*allocate: */
-        partition_contributions=NewVec(npart);
-        partition_areas=NewVec(npart);
-        vec_average=NewVec(npart);
+        partition_contributions=new Vector(npart);
+        partition_areas=new Vector(npart);
+        vec_average=new Vector(npart);
 
         /*loop on each element, and add contribution of the element to the partition (surface weighted average): */
@@ -55 +55 @@
 
         /*Assemble: */
-        VecAssemblyBegin(partition_contributions);
-        VecAssemblyEnd(partition_contributions);
-
-        VecAssemblyBegin(partition_areas);
-        VecAssemblyEnd(partition_areas);
+        partition_contributions->Assemble();
+        partition_areas->Assemble();
 
         /*We have the partition_areas and the partition_contributions for each partition -> compute the surfae weighted average: */
-        VecPointwiseDivide(vec_average,partition_contributions,partition_areas);
+        vec_average->PointwiseDivide(partition_contributions,partition_areas);
 
         /*serialize:*/
-        VecToMPISerial(&average,vec_average);
+        average=vec_average->ToMPISerial();
 
         /*Free ressources:*/
         xfree((void**)&qmu_part);
-        VecFree(&partition_contributions);
-        VecFree(&partition_areas);
-        VecFree(&vec_average);
+        xdelete(&partition_contributions);
+        xdelete(&partition_areas);
+        xdelete(&vec_average);
 
         /*Assign output pointers:*/