Changeset 4610

Timestamp:

07/14/10 16:55:01 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor for nightly runs

Location:

issm/trunk/src/c/objects/Elements

Files:

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

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

@@ -1858 +1858 @@
                         /*default vx,vy and vz: either observation or 0 */
                         if(!iomodel->vx){
-                                if (iomodel->vx_obs) for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_vertex_ids[i]-1]/iomodel->yts;
+                                if (false && iomodel->vx_obs) for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx_obs[penta_vertex_ids[i]-1]/iomodel->yts; // false TO BE DELETED (for NR CM)
                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
@@ -1865 +1865 @@
                         }
                         if(!iomodel->vy){
-                                if (iomodel->vy_obs) for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_vertex_ids[i]-1]/iomodel->yts;
+                                if (false && iomodel->vy_obs) for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy_obs[penta_vertex_ids[i]-1]/iomodel->yts; // false TO BE DELETED (for NR CM)
                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));

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

@@ -2367 +2367 @@
                         /*default vx,vy and vz: either observation or 0 */
                         if(!iomodel->vx){
-                                if (iomodel->vx_obs) for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_vertex_ids[i]-1]/iomodel->yts;
+                                if (false && iomodel->vx_obs) for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx_obs[tria_vertex_ids[i]-1]/iomodel->yts; //false TO BE DELETED (for NR CM)
                                 else                 for(i=0;i<3;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
@@ -2374 +2374 @@
                         }
                         if(!iomodel->vy){
-                                if (iomodel->vy_obs) for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_vertex_ids[i]-1]/iomodel->yts;
+                                if (false && iomodel->vy_obs) for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy_obs[tria_vertex_ids[i]-1]/iomodel->yts; //false TO BE DELETED (for NR CM)
                                 else                 for(i=0;i<3;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));