source: issm/oecreview/Archive/25834-26739/ISSM-26465-26466.diff@ 26740

Last change on this file since 26740 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739
File size: 2.7 KB
RevLine 
[26740]1Index: ../trunk-jpl/src/c/classes/Loads/Friction.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 26465)
4+++ ../trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 26466)
5@@ -18,7 +18,7 @@
6 Friction::Friction(){/*{{{*/
7 this->element=NULL;
8 this->law=0;
9- this->apply_dim = 1;
10+ this->apply_dim = 1.;
11 this->domaintype=-1;
12 this->vx_input=NULL;
13 this->vy_input=NULL;
14@@ -37,19 +37,19 @@
15 /* Load VxBase and VyBase for this special case */
16 switch(this->domaintype){
17 case Domain2DhorizontalEnum:
18- this->apply_dim = 2;
19+ this->apply_dim = 2.;
20 this->vx_input = element_in->GetInput(VxBaseEnum); _assert_(this->vx_input);
21 this->vy_input = element_in->GetInput(VyBaseEnum); _assert_(this->vy_input);
22 this->vz_input = NULL;
23 break;
24 case Domain2DverticalEnum:
25- this->apply_dim = 2;
26+ this->apply_dim = 2.;
27 this->vx_input = element_in->GetInput(VxEnum); _assert_(this->vx_input);
28 this->vy_input = element_in->GetInput(VyEnum); _assert_(this->vy_input);
29 this->vz_input = NULL;
30 break;
31 case Domain3DEnum:
32- this->apply_dim = 3;
33+ this->apply_dim = 3.;
34 this->vx_input = element_in->GetInput(VxEnum); _assert_(this->vx_input);
35 this->vy_input = element_in->GetInput(VyEnum); _assert_(this->vy_input);
36 this->vz_input = element_in->GetInput(VzEnum); _assert_(this->vz_input);
37@@ -58,7 +58,7 @@
38 }
39 }
40 /*}}}*/
41-Friction::Friction(Element* element_in, double dim){/*{{{*/
42+Friction::Friction(Element* element_in,IssmDouble dim){/*{{{*/
43
44 this->element=element_in;
45 this->apply_dim = dim;
46@@ -918,10 +918,10 @@
47 this->vx_input->GetInputValue(&vx, gauss);
48 this->vy_input->GetInputValue(&vy, gauss);
49
50- if ((this->vz_input == NULL) || (this->apply_dim<3)) vz = 0.0;
51+ if ((this->vz_input == NULL) || (this->apply_dim<3.)) vz = 0.0;
52 else this->vz_input->GetInputValue(&vz, gauss);
53
54- if (this->apply_dim<2) vy = 0.0;
55+ if (this->apply_dim<2.) vy = 0.0;
56
57 vmag = sqrt(vx*vx+vy*vy+vz*vz);
58 return vmag;
59Index: ../trunk-jpl/src/c/classes/Loads/Friction.h
60===================================================================
61--- ../trunk-jpl/src/c/classes/Loads/Friction.h (revision 26465)
62+++ ../trunk-jpl/src/c/classes/Loads/Friction.h (revision 26466)
63@@ -13,13 +13,13 @@
64 class Friction{
65
66 public:
67- Element* element;
68- int law;
69- int domaintype;
70- double apply_dim;
71- Input* vx_input;
72- Input* vy_input;
73- Input* vz_input;
74+ Element *element;
75+ int law;
76+ int domaintype;
77+ IssmDouble apply_dim;
78+ Input *vx_input;
79+ Input *vy_input;
80+ Input *vz_input;
81
82 /*methods: */
83 Friction();
Note: See TracBrowser for help on using the repository browser.