Changeset 13975 for issm/trunk/src/c/modules/InputConvergencex

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/InputConvergencex/InputConvergencex.cpp (modified) (2 diffs)
• src/c/modules/InputConvergencex/InputConvergencex.h (modified) (1 diff)

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

@@ -24 +24 @@
         /*Go through elements, and ask them to do the job: */
         for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                 converged=element->InputConvergence(eps,enums,num_enums,criterionenums,criterionvalues,num_criterionenums);
                 if(!converged) num_notconverged++;
@@ -31 +31 @@
         /*In parallel, we need to gather the converged status: */
         #ifdef _HAVE_MPI_
-        MPI_Allreduce ( (void*)&num_notconverged,(void*)&total_notconverged,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
+        MPI_Allreduce ( (void*)&num_notconverged,(void*)&total_notconverged,1,MPI_INT,MPI_SUM,IssmComm::GetComm());
         num_notconverged=total_notconverged;
         #endif

issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.h

@@ -11 +11 @@
 
 #endif  /* _INPUTCONVERGENCEX_H */
-