Changeset 20462

Timestamp:

04/07/16 14:55:28 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: added freeze field to dofindexing, if we run in 2d and not in 3d, it is not the job of SetActiveNodesLSMx to figure out whether it can activate or not a node that is not on the basal layer. The node should know better

Location:

issm/trunk-jpl/src/c

Files:

• classes/DofIndexing.cpp (modified) (7 diffs)
• classes/DofIndexing.h (modified) (1 diff)
• classes/Loads/Riftfront.cpp (modified) (1 diff)
• classes/Node.cpp (modified) (9 diffs)
• classes/Node.h (modified) (1 diff)
• modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/DofIndexing.cpp

@@ -28 +28 @@
         this->clone    = false;
         this->active   = true;
+        this->freeze   = false;
         this->f_set    = NULL;
         this->s_set    = NULL;
@@ -51 +52 @@
         this->clone  = in->clone;
         this->active = in->active;
+        this->freeze = in->freeze;
 
         if(this->gsize>0){
@@ -112 +114 @@
         this->clone  = in.clone;
         this->active = in.active;
+        this->freeze = in.freeze;
 
         if(this->gsize>0){
@@ -219 +222 @@
         _printf_("   clone:  " << clone << "\n");
         _printf_("   active: " << active << "\n");
+        _printf_("   freeze: " << freeze << "\n");
 }
 /*}}}*/
@@ -231 +235 @@
         _printf_("   clone:  " << clone << "\n");
         _printf_("   active: " << active << "\n");
+        _printf_("   freeze: " << freeze << "\n");
 
         _printf_("   set membership: f,s sets \n");
@@ -284 +289 @@
 /*}}}*/
 void DofIndexing::Activate(void){/*{{{*/
+
         this->active = true;
 
@@ -302 +308 @@
         MARSHALLING(clone);
         MARSHALLING(active);
+        MARSHALLING(freeze);
         MARSHALLING_DYNAMIC(f_set,bool,gsize);
         MARSHALLING_DYNAMIC(s_set,bool,gsize);

issm/trunk-jpl/src/c/classes/DofIndexing.h

@@ -18 +18 @@
 
                 /*partitioning: */
-                bool clone;   //this node is replicated from another one
-                bool active;  //Is this node active or inactive (all dofs are constrained)
+                bool clone;  //this node is replicated from another one
+                bool active; //Is this node active or inactive (all dofs are constrained)
+                bool freeze; //this is required for 2d solutions, we never activate nodes that are not on base
 
                 /*boundary conditions sets: */

issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

@@ -253 +253 @@
 void  Riftfront::InputUpdateFromVector(IssmDouble* vector, int name, int type){/*{{{*/
 
-        _error_("not implemented yet");
+        /*Nothing to update*/
 
 }

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -64 +64 @@
                         _assert_(iomodel->Data(FlowequationVertexEquationEnum));
                         if(in_approximation==SSAApproximationEnum && !reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[io_index])){
-                                this->Deactivate();
+                                this->HardDeactivate();
                         }
                         if(in_approximation==L1L2ApproximationEnum && !reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[io_index])){
-                                this->Deactivate();
+                                this->HardDeactivate();
                         }
                         if(in_approximation==SSAHOApproximationEnum && reCast<int>(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){
                                 if(!reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[io_index])){
-                                        this->Deactivate();
+                                        this->HardDeactivate();
                                 }
                         }
@@ -82 +82 @@
                 /*spc all nodes on SIA*/
                 if(in_approximation==SIAApproximationEnum){
-                        this->Deactivate();
+                        this->HardDeactivate();
                 }
         }
@@ -101 +101 @@
                         _assert_(iomodel->Data(MeshVertexonbaseEnum));
                         if(!(reCast<bool>(iomodel->Data(MeshVertexonbaseEnum)[io_index]))){
-                                this->Deactivate();
+                                this->HardDeactivate();
                         }
                 }
@@ -112 +112 @@
                         _assert_(iomodel->Data(MeshVertexonsurfaceEnum));
                         if(!(reCast<bool>(iomodel->Data(MeshVertexonsurfaceEnum)[io_index]))){
-                                this->Deactivate();
+                                this->HardDeactivate();
                         }
                 }
@@ -463 +463 @@
 
         if(this->indexing.f_set[dof] == 1){
+                //if(this->indexing.freeze) _error_("Cannot change dof of frozen node");
                 this->indexingupdate = true;
                 this->indexing.f_set[dof]=0; //n splits into f (for which we solve) and s (single point constraints)
@@ -476 +477 @@
 
         if(this->indexing.f_set[dof] == 0){
+                if(this->indexing.freeze) _error_("Cannot change dof of frozen node");
                 this->indexingupdate = true;
                 this->indexing.f_set[dof]=1; 
@@ -485 +487 @@
 
         DofInSSet(dof); //with 0 displacement for this dof.
+        //FIXME: for now we don't want this element to change so we use freeze
+        this->indexing.freeze =true;
 
 }
@@ -490 +494 @@
 void Node::Deactivate(void){/*{{{*/
 
-        if(IsActive()){
+        if(IsActive() && !this->indexing.freeze){
                 this->indexingupdate = true;
                 indexing.Deactivate();
@@ -497 +501 @@
 }
 /*}}}*/
+void Node::HardDeactivate(void){/*{{{*/
+
+        this->indexing.Deactivate();
+        this->indexing.freeze =true;
+
+}
+/*}}}*/
 void Node::Activate(void){/*{{{*/
 
-        if(!IsActive()){
+        if(!IsActive() && !this->indexing.freeze){
                 this->indexingupdate = true;
                 indexing.Activate();

issm/trunk-jpl/src/c/classes/Node.h

@@ -73 +73 @@
                 void  Activate(void);
                 void  Deactivate(void);
+                void  HardDeactivate(void);
                 void  ReindexingDone(void);
                 bool  RequiresDofReindexing(void);

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

@@ -49 +49 @@
                 }
 
-                /* if solving 2d problem on vertically extende mesh, solve on basal layer only*/
-                if(domaintype!=Domain2DhorizontalEnum){
-                        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-                        if(
-                                        analysis_type==FreeSurfaceBaseAnalysisEnum || 
-                                        analysis_type==MasstransportAnalysisEnum || 
-                                        analysis_type==MeltingAnalysisEnum || 
-                                        analysis_type==L2ProjectionBaseAnalysisEnum || 
-                                        analysis_type==BalancethicknessAnalysisEnum ||
-                                        analysis_type==HydrologyDCInefficientAnalysisEnum ||
-                                        //analysis_type==DamageEvolutionAnalysisEnum || 
-                                        analysis_type==HydrologyDCEfficientAnalysisEnum ||
-                                        analysis_type==LevelsetAnalysisEnum ||
-                                        analysis_type==ExtrapolationAnalysisEnum
-                                        ){ solvein2d=true;}
-
-                        if(analysis_type==StressbalanceAnalysisEnum){
-                                bool isSIA,isSSA,isL1L2;
-                                femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
-                                femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
-                                femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum);
-                                if(isSIA || isSSA || isL1L2)
-                                        solvein2d=true;
-                        }
-
-                        if(solvein2d){
-                                IssmDouble *mask_isonbase = xNew<IssmDouble>(numnodes);
-                                element->GetInputListOnNodes(&mask_isonbase[0],MeshVertexonbaseEnum);
-                                for(in=0;in<numnodes;in++)       mask[in]*=mask_isonbase[in];
-                                xDelete<IssmDouble>(mask_isonbase);
-                        }
-                }
-
                 for(in=0;in<numnodes;in++){
                         Node* node=element->GetNode(in);