Changeset 13975 for issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.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/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (8 diffs)

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

@@ -19 +19 @@
         Vector<IssmDouble>*      vec_old_floatingice              = NULL;
         Element* element                          = NULL;
-        
+
         if(VerboseModule()) _pprintLine_("   Migrating grounding line");
-        
+
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
@@ -43 +43 @@
         /*Migrate grounding line : */
         for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                 element->MigrateGroundingLine(old_floatingice,vertices_ungrounding);
         }
@@ -95 +95 @@
         /*Fill vector vertices_potentially_floating: */
         for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                 element->PotentialSheetUngrounding(vec_vertices_potentially_ungrounding);
         }
@@ -121 +121 @@
         Element* element                               = NULL;
 
-
         /*recover parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
@@ -132 +131 @@
         nflipped=1; //bootstrap
         while(nflipped){
-                
+
                 /*Vector of size number of elements*/
                 vec_elements_neighboring_floatingice=new Vector<IssmDouble>(elements->NumberOfElements(),true);
@@ -138 +137 @@
                 /*Figure out if any of the nodes of the element will be floating -> elements neighbouting the floating ice*/
                 for(i=0;i<elements->Size();i++){
-                        element=(Element*)elements->GetObjectByOffset(i);
+                        element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                         vec_elements_neighboring_floatingice->SetValue(element->Sid(),element->IsNodeOnShelfFromFlags(nodes_on_floatingice)?1.0:0.0,INS_VAL);
                 }
@@ -149 +148 @@
                 local_nflipped=0;
                 for(i=0;i<elements->Size();i++){
-                        element=(Element*)elements->GetObjectByOffset(i);
+                        element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                         if(reCast<int,IssmDouble>(elements_neighboring_floatingce[element->Sid()])){
                                 local_nflipped+=element->UpdatePotentialSheetUngrounding(vertices_potentially_ungrounding,vec_nodes_on_floatingice,nodes_on_floatingice);
@@ -155 +154 @@
                 }
                 vec_nodes_on_floatingice->Assemble();
-                
+
                 #ifdef _HAVE_MPI_
-                MPI_Allreduce(&local_nflipped,&nflipped,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
+                MPI_Allreduce(&local_nflipped,&nflipped,1,MPI_INT,MPI_SUM,IssmComm::GetComm());
                 if(VerboseConvergence()) _pprintLine_("   Additional number of vertices allowed to unground: " << nflipped);
                 #else