Changeset 26448

Timestamp:

09/21/21 11:41:28 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: made Crevasse depth more efficient by removing ToMPISerial

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (9 diffs)

issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

@@ -516 +516 @@
                 }
         }
-
-        if(calvinglaw==CalvingHabEnum){
+   else if(calvinglaw==CalvingHabEnum){
 
                 /*Get the fraction of the flotation thickness at the terminus*/
@@ -559 +558 @@
                 }
         }
-
-        if(calvinglaw==CalvingCrevasseDepthEnum){
-
-                int                 nflipped,local_nflipped;
-                Vector<IssmDouble>* vec_constraint_nodes = NULL;
+   else if(calvinglaw==CalvingCrevasseDepthEnum){
+
+                int   nflipped,local_nflipped;
                 IssmDouble* constraint_nodes = NULL;
 
@@ -571 +568 @@
 
                 /*Vector of size number of nodes*/
-                vec_constraint_nodes=new Vector<IssmDouble>(femmodel->nodes->NumberOfNodes());
+      int numnodes      = femmodel->nodes->NumberOfNodes();
+      int localmasters  = femmodel->nodes->NumberOfNodesLocal();
+      Vector<IssmDouble>* vec_constraint_nodes = vec_constraint_nodes=new Vector<IssmDouble>(localmasters,numnodes);
 
                 for(Object* & object : femmodel->elements->objects){
-                        Element* element               = xDynamicCast<Element*>(object);
-                        int      numnodes              = element->GetNumberOfNodes();
-                        Gauss*   gauss                 = element->NewGauss();
-                        Input*   crevassedepth_input   = element->GetInput(CrevasseDepthEnum); _assert_(crevassedepth_input);
-                        Input*   bed_input             = element->GetInput(BedEnum); _assert_(bed_input);
+                        Element* element   = xDynamicCast<Element*>(object);
+                        int      numnodes  = element->GetNumberOfNodes();
+                        Gauss*   gauss     = element->NewGauss();
+
+                        Input*   crevassedepth_input    = element->GetInput(CrevasseDepthEnum); _assert_(crevassedepth_input);
+                        Input*   bed_input              = element->GetInput(BedEnum); _assert_(bed_input);
                         Input*   surface_crevasse_input = element->GetInput(SurfaceCrevasseEnum); _assert_(surface_crevasse_input);
-                        Input*   thickness_input       = element->GetInput(ThicknessEnum); _assert_(thickness_input);
-                        Input*   surface_input         = element->GetInput(SurfaceEnum); _assert_(surface_input);
+                        Input*   thickness_input        = element->GetInput(ThicknessEnum); _assert_(thickness_input);
+                        Input*   surface_input          = element->GetInput(SurfaceEnum); _assert_(surface_input);
 
                         /*First, look at ice front and figure out if any of the nodes will be calved*/
@@ -606 +606 @@
                 /*Assemble vector and serialize: */
                 vec_constraint_nodes->Assemble();
-                constraint_nodes=vec_constraint_nodes->ToMPISerial();
+      femmodel->GetLocalVectorWithClonesNodes(&constraint_nodes,vec_constraint_nodes);
 
                 nflipped=1;
@@ -612 +612 @@
                         local_nflipped=0;
                         for(Object* & object : femmodel->elements->objects){
-                                Element* element                = xDynamicCast<Element*>(object);
-                                int      numnodes               = element->GetNumberOfNodes();
-                                Gauss*   gauss                  = element->NewGauss();
+                                Element* element  = xDynamicCast<Element*>(object);
+                                int      numnodes = element->GetNumberOfNodes();
+                                Gauss*   gauss    = element->NewGauss();
+
                                 Input*   levelset_input         = element->GetInput(DistanceToCalvingfrontEnum); _assert_(levelset_input);
                                 Input*   crevassedepth_input    = element->GetInput(CrevasseDepthEnum); _assert_(crevassedepth_input);
@@ -626 +627 @@
                                 for(int in=0;in<numnodes;in++){
                                         Node* node=element->GetNode(in);
-                                        if(constraint_nodes[node->Pid()]==1.){
+                                        if(constraint_nodes[node->Lid()]==1.){
                                                 isconnected = true;
                                                 break;
@@ -644 +645 @@
                                                 surface_input->GetInputValue(&surface,gauss);
 
-                                                if((surface_crevasse-surface>0. || crevassedepth-thickness>0.) && bed<0. && levelset>-300. && levelset<0. && constraint_nodes[node->Pid()]==0.){
+                                                if((surface_crevasse-surface>0. || crevassedepth-thickness>0.) && bed<0. && levelset>-300. && levelset<0. && constraint_nodes[node->Lid()]==0.){
                                                         local_nflipped++;
                                                         vec_constraint_nodes->SetValue(node->Pid(),1.0,INS_VAL);
@@ -659 +660 @@
                         vec_constraint_nodes->Assemble();
                         xDelete<IssmDouble>(constraint_nodes);
-                        constraint_nodes=vec_constraint_nodes->ToMPISerial();
+         femmodel->GetLocalVectorWithClonesNodes(&constraint_nodes,vec_constraint_nodes);
                 }
                 /*Free ressources:*/
@@ -675 +676 @@
                                 if(!node->IsActive()) continue;
 
-                                if(constraint_nodes[node->Pid()]>0.){
+                                if(constraint_nodes[node->Lid()]>0.){
                                         node->ApplyConstraint(0,+1.);
                                 }