Changeset 3856

Timestamp:

05/19/10 16:42:11 (15 years ago)

Author:

seroussi

Message:

velocities in m/s

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -128 +128 @@
         /*vx,vy and vz: */
         if (iomodel->vx) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs));
         }
         if (iomodel->vy) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs));
         }
         if (iomodel->vz) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs));
         }
         if (iomodel->vx_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VxObsEnum,nodeinputs));
         }
         if (iomodel->vy_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VyObsEnum,nodeinputs));
         }
         if (iomodel->vz_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VzObsEnum,nodeinputs));
         }
@@ -161 +161 @@
         /*default vx,vy and vz: */
         if (!iomodel->vx && iomodel->vx_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs));
         }
         if (!iomodel->vy && iomodel->vy_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs));
         }
         if (!iomodel->vz && iomodel->vz_obs) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz_obs[penta_node_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz_obs[penta_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
                 this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs));

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -122 +122 @@
         /*vx,vy and vz: */
         if (iomodel->vx) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs));
         }
         if (iomodel->vy) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs));
         }
         if (iomodel->vz) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs));
         }
         if (iomodel->vx_obs) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VxObsEnum,nodeinputs));
         }
         if (iomodel->vy_obs) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VyObsEnum,nodeinputs));
         }
         if (iomodel->vz_obs) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VzObsEnum,nodeinputs));
         }
@@ -154 +154 @@
         /*Default vx,vy and vz?:*/
         if(!iomodel->vx && iomodel->vx_obs){
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs));
         }
         if(!iomodel->vy && iomodel->vy_obs){
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs));
         }
         if(!iomodel->vz && iomodel->vz_obs){
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz_obs[tria_node_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz_obs[tria_node_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
                 this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs));
@@ -176 +176 @@
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.
         this->parameters=NULL;
-
 
 }