Changeset 26206

Timestamp:

04/22/21 11:14:54 (4 years ago)

Author:

tsantos

Message:

BUG: fixing friction computation for MLHO

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• classes/Loads/Friction.cpp (modified) (3 diffs)
• classes/Loads/Friction.h (modified) (1 diff)

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

@@ -2732 +2732 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixMLHO(Element* element){/*{{{*/
         
-        _error_("Mono Layer Higher-Order called, not fully tested. If you are sure of using it, comment this line.");
+        //_error_("Mono Layer Higher-Order called, not fully tested. If you are sure of using it, comment this line.");
         
         /* Check if ice in element */
@@ -2783 +2783 @@
 
         /*build friction object, used later on: */
-        Friction* friction=new Friction(element,dim);
+        Friction* friction=new Friction(element,dim,true);
 
         /*Recover portion of element that is grounded*/

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

@@ -20 +20 @@
         this->dim=0;
         this->law=0;
+        this->isMLHO=false;
 
 }
 /*}}}*/
-Friction::Friction(Element* element_in,int dim_in){/*{{{*/
+Friction::Friction(Element* element_in,int dim_in,bool isMLHO_in){/*{{{*/
 
         this->element=element_in;
         this->dim=dim_in;
+        this->isMLHO=isMLHO_in;
         element_in->FindParam(&this->law,FrictionLawEnum);
 }
@@ -855 +857 @@
 
         /*diverse*/
-        bool isMLHO=false; //employing mono layer higher order model? Default is no 
         IssmDouble vx,vy,vz,vmag;
         
-        element->parameters->FindParam(&isMLHO,FlowequationIsMLHOEnum);
-        if(isMLHO) _assert_(dim==2);
+        if(this->isMLHO) _assert_(dim==2);
 
         switch(dim){
@@ -867 +867 @@
                         break;
                 case 2:
-                        if(isMLHO){
+                        if(this->isMLHO){
                                 element->GetInputValue(&vx,gauss,VxBaseEnum);
                                 element->GetInputValue(&vy,gauss,VyBaseEnum);

issm/trunk-jpl/src/c/classes/Loads/Friction.h

@@ -17 +17 @@
                 int      dim;
                 int      law;
+                bool            isMLHO=false;
 
                 /*methods: */
                 Friction();
-                Friction(Element* element_in,int dim_in);
+                Friction(Element* element_in,int dim_in,bool isMLHO=0);
                 ~Friction();