Changeset 26466

Timestamp:

09/30/21 08:29:10 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: update to int double

Location:

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

Files:

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

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

@@ -19 +19 @@
         this->element=NULL;
         this->law=0;
-        this->apply_dim = 1;
+        this->apply_dim = 1.;
         this->domaintype=-1;
         this->vx_input=NULL;
@@ -38 +38 @@
         switch(this->domaintype){
                 case Domain2DhorizontalEnum: 
-                        this->apply_dim = 2;
+                        this->apply_dim = 2.;
                         this->vx_input = element_in->GetInput(VxBaseEnum);                      _assert_(this->vx_input); 
                         this->vy_input = element_in->GetInput(VyBaseEnum);                      _assert_(this->vy_input);
@@ -44 +44 @@
                         break;
       case Domain2DverticalEnum:
-                        this->apply_dim = 2;
+                        this->apply_dim = 2.;
                         this->vx_input = element_in->GetInput(VxEnum);                          _assert_(this->vx_input);
                         this->vy_input = element_in->GetInput(VyEnum);                          _assert_(this->vy_input);
@@ -50 +50 @@
                         break;
       case Domain3DEnum:           
-                        this->apply_dim = 3;
+                        this->apply_dim = 3.;
                         this->vx_input = element_in->GetInput(VxEnum);                          _assert_(this->vx_input);
                         this->vy_input = element_in->GetInput(VyEnum);                          _assert_(this->vy_input);
@@ -59 +59 @@
 }
 /*}}}*/
-Friction::Friction(Element* element_in, double dim){/*{{{*/
+Friction::Friction(Element* element_in,IssmDouble dim){/*{{{*/
 
         this->element=element_in;
@@ -919 +919 @@
         this->vy_input->GetInputValue(&vy, gauss);
 
-        if ((this->vz_input == NULL) || (this->apply_dim<3)) vz = 0.0;
+        if ((this->vz_input == NULL) || (this->apply_dim<3.)) vz = 0.0;
         else this->vz_input->GetInputValue(&vz, gauss);
         
-        if (this->apply_dim<2) vy = 0.0;
+        if (this->apply_dim<2.) vy = 0.0;
 
         vmag = sqrt(vx*vx+vy*vy+vz*vz);

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

@@ -14 +14 @@
 
         public:
-                Element* element;
-                int      law;
-                int      domaintype;
-                double  apply_dim;
-                Input*  vx_input;
-                Input*  vy_input;
-                Input*  vz_input;
+                Element    *element;
+                int         law;
+                int         domaintype;
+                IssmDouble  apply_dim;
+                Input      *vx_input;
+                Input      *vy_input;
+                Input      *vz_input;
 
                 /*methods: */