Changeset 26744 for issm/trunk/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (3 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

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

@@ -63 +63 @@
         int numvertices=femmodel->vertices->NumberOfVertices();
         if(numvertices==0)  return;
-        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices);
+
+        int numvert_local = femmodel->vertices->NumberOfVerticesLocal();
+        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvert_local,numvertices);
 
         /*Fill vector with values: */
@@ -71 +73 @@
                         int nbv = element->GetNumberOfVertices();
                         for(int iv=0;iv<nbv;iv++){
-                                vec_mask_ice->SetValue(element->vertices[iv]->Sid(),1.,INS_VAL);
+                                vec_mask_ice->SetValue(element->vertices[iv]->Pid(),1.,INS_VAL);
                         }
                 }
@@ -78 +80 @@
         /*Assemble vector and serialize */
         vec_mask_ice->Assemble();
-        InputUpdateFromVectorx(femmodel,vec_mask_ice,IceMaskNodeActivationEnum,VertexSIdEnum);
+        InputUpdateFromVectorx(femmodel,vec_mask_ice,IceMaskNodeActivationEnum,VertexPIdEnum);
         delete vec_mask_ice;
 }/*}}}*/

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean