Changeset 17007

Timestamp:

12/04/13 19:53:41 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not change z for 2d horizontal meshes

File:

• issm/trunk-jpl/src/c/classes/Vertex.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Vertex.cpp

@@ -132 +132 @@
 
         /*sigma remains constant. z=bed+sigma*thickness*/
-        if(this->meshtype==Mesh2DverticalEnum){
-                oldy = this->y;
-                newy = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]);
-                vely = (newy-oldy)/dt;
-                this->y = newy;
-                vy->SetValue(this->pid,vely,INS_VAL);
-        }
-        else{
-                oldz = this->z;
-                newz = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]);
-                velz = (newz-oldz)/dt;
-                this->z = newz;
-                vz->SetValue(this->pid,velz,INS_VAL);
+        switch(this->meshtype){
+                case Mesh2DhorizontalEnum:
+                        /*Nothing*/
+                        return;
+                case Mesh2DverticalEnum:
+                        oldy = this->y;
+                        newy = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]);
+                        vely = (newy-oldy)/dt;
+                        this->y = newy;
+                        vy->SetValue(this->pid,vely,INS_VAL);
+                        return;
+                case Mesh3DEnum:
+                        oldz = this->z;
+                        newz = bed[this->pid]+sigma*(surface[this->pid] - bed[this->pid]);
+                        velz = (newz-oldz)/dt;
+                        this->z = newz;
+                        vz->SetValue(this->pid,velz,INS_VAL);
+                        return;
+                default:
+                        _error_("not implemented");
         }
 }