Index: ../trunk-jpl/src/c/classes/Loads/Friction.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 26465) +++ ../trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 26466) @@ -18,7 +18,7 @@ Friction::Friction(){/*{{{*/ this->element=NULL; this->law=0; - this->apply_dim = 1; + this->apply_dim = 1.; this->domaintype=-1; this->vx_input=NULL; this->vy_input=NULL; @@ -37,19 +37,19 @@ /* Load VxBase and VyBase for this special case */ 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); this->vz_input = NULL; 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); this->vz_input = NULL; 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); this->vz_input = element_in->GetInput(VzEnum); _assert_(this->vz_input); @@ -58,7 +58,7 @@ } } /*}}}*/ -Friction::Friction(Element* element_in, double dim){/*{{{*/ +Friction::Friction(Element* element_in,IssmDouble dim){/*{{{*/ this->element=element_in; this->apply_dim = dim; @@ -918,10 +918,10 @@ this->vx_input->GetInputValue(&vx, gauss); 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); return vmag; Index: ../trunk-jpl/src/c/classes/Loads/Friction.h =================================================================== --- ../trunk-jpl/src/c/classes/Loads/Friction.h (revision 26465) +++ ../trunk-jpl/src/c/classes/Loads/Friction.h (revision 26466) @@ -13,13 +13,13 @@ class Friction{ 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: */ Friction();