Changeset 27282 for issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp

Timestamp:

09/14/22 12:59:00 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing ground for GlaDS bigger domain

File:

• issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (8 diffs)

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

@@ -10 +10 @@
 #include "../modules.h"
 
-void SetActiveNodesLSMx(FemModel* femmodel){/*{{{*/
+void SetActiveNodesLSMx(FemModel* femmodel,bool ishydrology){/*{{{*/
         /* activate/deactivate nodes for levelset method according to IceMaskNodeActivation */
 
-        /* find parameters */
-        int domaintype;
-        femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
+        /*Determine which node activation mask to pull from*/
+        int nodeactivationmask = IceMaskNodeActivationEnum;
+        if(ishydrology) nodeactivationmask = HydrologyMaskNodeActivationEnum;
+
 
         for(Object* & object : femmodel->elements->objects){
@@ -28 +29 @@
                         case TaylorHoodEnum:case XTaylorHoodEnum:case LATaylorHoodEnum:
                         case CrouzeixRaviartEnum:case LACrouzeixRaviartEnum:case OneLayerP4zEnum:{
-                                Input* input=element->GetInput(IceMaskNodeActivationEnum);
-                                if(!input) _error_("Input " << EnumToStringx(IceMaskNodeActivationEnum) << " not found in element");
+                                Input* input=element->GetInput(nodeactivationmask);
+                                if(!input) _error_("Input " << EnumToStringx(nodeactivationmask) << " not found in element");
 
                                 /* Start looping on the number of vertices: */
@@ -45 +46 @@
                         }
                         default:
-                                element->GetInputListOnNodes(&mask[0],IceMaskNodeActivationEnum);
+                                element->GetInputListOnNodes(&mask[0],nodeactivationmask);
                                 break;
                 }
@@ -58 +59 @@
 }/*}}}*/
 
-void GetMaskOfIceVerticesLSMx0(FemModel* femmodel){/*{{{*/
+void GetMaskOfIceVerticesLSMx0(FemModel* femmodel,bool ishydrology){/*{{{*/
+
+        /*Determine which node activation to construct*/
+        int nodeactivationmask = IceMaskNodeActivationEnum;
+        if(ishydrology) nodeactivationmask = HydrologyMaskNodeActivationEnum;
 
         /*Initialize vector with number of vertices*/
@@ -68 +73 @@
 
         /*Fill vector with values: */
-        for(Object* & object : femmodel->elements->objects){
-                Element* element=xDynamicCast<Element*>(object);
-                if(element->IsIceInElement()){
-                        int nbv = element->GetNumberOfVertices();
-                        for(int iv=0;iv<nbv;iv++){
-                                vec_mask_ice->SetValue(element->vertices[iv]->Pid(),1.,INS_VAL);
+        if(ishydrology){
+                for(Object* & object : femmodel->elements->objects){
+                        Element* element=xDynamicCast<Element*>(object);
+                        if(element->IsIceInElement()){
+                                int nbv = element->GetNumberOfVertices();
+                                for(int iv=0;iv<nbv;iv++){
+                                        vec_mask_ice->SetValue(element->vertices[iv]->Pid(),1.,INS_VAL);
+                                }
+                        }
+                }
+        }
+        else{
+                for(Object* & object : femmodel->elements->objects){
+                        Element* element=xDynamicCast<Element*>(object);
+                        if(element->IsIceInElement() && element->IsGrounded()){
+                                int nbv = element->GetNumberOfVertices();
+                                for(int iv=0;iv<nbv;iv++){
+                                        vec_mask_ice->SetValue(element->vertices[iv]->Pid(),1.,INS_VAL);
+                                }
                         }
                 }
@@ -80 +98 @@
         /*Assemble vector and serialize */
         vec_mask_ice->Assemble();
-        InputUpdateFromVectorx(femmodel,vec_mask_ice,IceMaskNodeActivationEnum,VertexPIdEnum);
+        InputUpdateFromVectorx(femmodel,vec_mask_ice,nodeactivationmask,VertexPIdEnum);
         delete vec_mask_ice;
 }/*}}}*/
-void GetMaskOfIceVerticesLSMx(FemModel* femmodel){/*{{{*/
+void GetMaskOfIceVerticesLSMx(FemModel* femmodel,bool ishydrology){/*{{{*/
 
-        femmodel->SetCurrentConfiguration(LevelsetAnalysisEnum);
+        /*Set configuration to levelset*/
+        if(ishydrology){
+                /*We may not be running with ismovingfront so we can't assume LevelsetAnalysis is active*/
+                femmodel->SetCurrentConfiguration(HydrologyGlaDSAnalysisEnum);
+        }
+        else{
+                femmodel->SetCurrentConfiguration(LevelsetAnalysisEnum);
+        }
+
+        /*Determine which node activation to construct*/
+        int nodeactivationmask = IceMaskNodeActivationEnum;
+        if(ishydrology) nodeactivationmask = HydrologyMaskNodeActivationEnum;
 
         /*Create vector on gset*/
@@ -97 +126 @@
                 Element* element=xDynamicCast<Element*>(object);
 
-                if(element->IsIceInElement()){
-                        int numnodes = element->GetNumberOfNodes();
-                        int  gsize_local=GetNumberOfDofs(element->nodes,numnodes,GsetEnum,NoneEnum);
-                        int* glist_local=GetGlobalDofList(element->nodes,numnodes,GsetEnum,NoneEnum);
-                        IssmDouble* ones = xNew<IssmDouble>(gsize_local);
-                        for(int n=0;n<gsize_local;n++) ones[n] = 1.;
-                        vec_mask_ice->SetValues(gsize_local,glist_local,ones,INS_VAL);
-                        xDelete<IssmDouble>(ones);
-                        xDelete<int>(glist_local);
+                if(ishydrology){
+                        if(element->IsIceInElement() && element->IsGrounded()){
+                                int numnodes = element->GetNumberOfNodes();
+                                int  gsize_local=GetNumberOfDofs(element->nodes,numnodes,GsetEnum,NoneEnum);
+                                int* glist_local=GetGlobalDofList(element->nodes,numnodes,GsetEnum,NoneEnum);
+                                IssmDouble* ones = xNew<IssmDouble>(gsize_local);
+                                for(int n=0;n<gsize_local;n++) ones[n] = 1.;
+                                vec_mask_ice->SetValues(gsize_local,glist_local,ones,INS_VAL);
+                                xDelete<IssmDouble>(ones);
+                                xDelete<int>(glist_local);
+                        }
+                }
+                else{
+                        if(element->IsIceInElement()){
+                                int numnodes = element->GetNumberOfNodes();
+                                int  gsize_local=GetNumberOfDofs(element->nodes,numnodes,GsetEnum,NoneEnum);
+                                int* glist_local=GetGlobalDofList(element->nodes,numnodes,GsetEnum,NoneEnum);
+                                IssmDouble* ones = xNew<IssmDouble>(gsize_local);
+                                for(int n=0;n<gsize_local;n++) ones[n] = 1.;
+                                vec_mask_ice->SetValues(gsize_local,glist_local,ones,INS_VAL);
+                                xDelete<IssmDouble>(ones);
+                                xDelete<int>(glist_local);
+                        }
                 }
         }
@@ -120 +163 @@
         for(Object* & object : femmodel->elements->objects){
                 Element* element=xDynamicCast<Element*>(object);
-                element->InputUpdateFromSolutionOneDof(local_ug,IceMaskNodeActivationEnum);
+                element->InputUpdateFromSolutionOneDof(local_ug,nodeactivationmask);
         }