Changeset 26470

Timestamp:

10/04/21 13:07:10 (3 years ago)

Author:

Cheng Gong

Message:

BUG: fixed constructor of Friction for dim with different data types

Location:

issm/trunk-jpl/src/c/classes/Loads

Files:

• Friction.cpp (modified) (2 diffs)
• Friction.h (modified) (1 diff)

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

@@ -59 +59 @@
 }
 /*}}}*/
-Friction::Friction(Element* element_in,IssmDouble dim){/*{{{*/
-
-        this->element=element_in;
+Friction::Friction(Element* element_in,int dim) : Friction(element_in) {/*{{{*/
+        this->apply_dim = reCast<IssmDouble>(dim);
+}
+/*}}}*/
+Friction::Friction(Element* element_in,IssmDouble dim) : Friction(element_in) {/*{{{*/
         this->apply_dim = dim;
-
-        /* Load necessary parameters */
-        element_in->FindParam(&this->law,FrictionLawEnum);
-        element_in->FindParam(&this->domaintype,DomainTypeEnum);
-
-        /* Load VxBase and VyBase for this special case */
-        switch(this->domaintype){
-                case Domain2DhorizontalEnum: 
-                        this->vx_input = element_in->GetInput(VxBaseEnum);                      _assert_(this->vx_input); 
-                        this->vy_input = element_in->GetInput(VyBaseEnum);                      _assert_(this->vy_input);
-                        this->vz_input = NULL;
-                        break;
-      case Domain2DverticalEnum:
-                        this->vx_input = element_in->GetInput(VxEnum);                          _assert_(this->vx_input);
-                        this->vy_input = element_in->GetInput(VyEnum);                          _assert_(this->vy_input);
-                        this->vz_input = NULL;
-                        break;
-      case Domain3DEnum:           
-                        this->vx_input = element_in->GetInput(VxEnum);                          _assert_(this->vx_input);
-                        this->vy_input = element_in->GetInput(VyEnum);                          _assert_(this->vy_input);
-                        this->vz_input = element_in->GetInput(VzEnum);                          _assert_(this->vz_input);
-                        break;
-      default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
-        }
 }
 /*}}}*/
@@ -92 +70 @@
 }
 /*}}}*/
+
 
 /*methods: */

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

@@ -25 +25 @@
                 Friction();
                 Friction(Element* element_in);
-                Friction(Element* element_in, double dim);
+                Friction(Element* element_in, int dim);
+                Friction(Element* element_in, IssmDouble dim);
                 ~Friction();