Changeset 3732 for issm/trunk/src/c/objects/Elements/Sing.cpp

Timestamp:

05/12/10 08:19:37 (15 years ago)

Author:

Eric.Larour

Message:

Bulk of solutions

File:

• issm/trunk/src/c/objects/Elements/Sing.cpp (modified) (1 diff)

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

@@ -90 +90 @@
         if (iomodel->vy) this->inputs->AddInput(new SingVertexInput(VyEnum,iomodel->vy[i]));
         if (iomodel->vz) this->inputs->AddInput(new SingVertexInput(VzEnum,iomodel->vz[i]));
-        if (iomodel->vx_obs) this->inputs->AddInput(new SingVertexInput(VxEnum,iomodel->vx_obs[i]));
-        if (iomodel->vy_obs) this->inputs->AddInput(new SingVertexInput(VyEnum,iomodel->vy_obs[i]));
-        if (iomodel->vz_obs) this->inputs->AddInput(new SingVertexInput(VzEnum,iomodel->vz_obs[i]));
+        if (iomodel->vx_obs) this->inputs->AddInput(new SingVertexInput(VxObsEnum,iomodel->vx_obs[i]));
+        if (iomodel->vy_obs) this->inputs->AddInput(new SingVertexInput(VyObsEnum,iomodel->vy_obs[i]));
+        if (iomodel->vz_obs) this->inputs->AddInput(new SingVertexInput(VzObsEnum,iomodel->vz_obs[i]));
         if (iomodel->weights) this->inputs->AddInput(new SingVertexInput(WeightsEnum,iomodel->weights[i]));
+        if (!iomodel->vx && iomodel->vx_obs){
+                this->inputs->AddInput(new SingVertexInput(VxEnum,iomodel->vx_obs[i]));
+                this->inputs->AddInput(new SingVertexInput(VxOldEnum,iomodel->vx_obs[i]));
+        }
+        if (!iomodel->vy && iomodel->vy_obs){
+                this->inputs->AddInput(new SingVertexInput(VyEnum,iomodel->vy_obs[i]));
+                this->inputs->AddInput(new SingVertexInput(VyOldEnum,iomodel->vy_obs[i]));
+        }
+        if (!iomodel->vz && iomodel->vz_obs){
+                this->inputs->AddInput(new SingVertexInput(VzEnum,iomodel->vz_obs[i]));
+                this->inputs->AddInput(new SingVertexInput(VzOldEnum,iomodel->vz_obs[i]));
+        }
+
 
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.