Changeset 13975 for issm/trunk/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp

@@ -26 +26 @@
         /*Compute Misfit: */
         for (i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                 J+=element->SurfaceAverageVelMisfit(process_units,weight_index);
         }
@@ -32 +32 @@
         /*Sum all J from all cpus of the cluster:*/
         #ifdef _HAVE_MPI_
-        MPI_Reduce (&J,&J_sum,1,MPI_DOUBLE,MPI_SUM,0,MPI_COMM_WORLD );
-        MPI_Bcast(&J_sum,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
+        MPI_Reduce (&J,&J_sum,1,MPI_DOUBLE,MPI_SUM,0,IssmComm::GetComm() );
+        MPI_Bcast(&J_sum,1,MPI_DOUBLE,0,IssmComm::GetComm());
         J=J_sum;
         #endif