Changeset 10996

Timestamp:

11/30/11 16:33:13 (13 years ago)

Author:

seroussi

Message:

removed defaulting to observed velocities in diagnostic

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -59 +59 @@
         iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
         iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
-        iomodel->FetchDataToInput(elements,VxEnum,InversionVxObsEnum,0);
-        iomodel->FetchDataToInput(elements,VyEnum,InversionVyObsEnum,0);
+        iomodel->FetchDataToInput(elements,VxEnum);
+        iomodel->FetchDataToInput(elements,VyEnum);
         iomodel->FetchDataToInput(elements,BathymetryEnum);
 

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

@@ -2692 +2692 @@
                         /*default vx,vy and vz: either observation or 0 */
                         if(!iomodel->Data(VxEnum)){
-                                if (iomodel->Data(InversionVxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVxObsEnum)[penta_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
+                                for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
-                                this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
                         }
                         if(!iomodel->Data(VyEnum)){
-                                if (iomodel->Data(InversionVyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVyObsEnum)[penta_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
+                                for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
-                                this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
                         }
                         if(!iomodel->Data(VzEnum)){
-                                if (iomodel->Data(InversionVzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVzObsEnum)[penta_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
+                                for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
-                                this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
                         }

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

@@ -2327 +2327 @@
                         /*default vx,vy and vz: either observation or 0 */
                         if(!iomodel->Data(VxEnum)){
-                                if (iomodel->Data(InversionVxObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVxObsEnum)[tria_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
+                                for(i=0;i<3;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
-                                this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
                         }
                         if(!iomodel->Data(VyEnum)){
-                                if (iomodel->Data(InversionVyObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVyObsEnum)[tria_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
+                                for(i=0;i<3;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
-                                this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
                         }
                         if(!iomodel->Data(VzEnum)){
-                                if (iomodel->Data(InversionVzObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVzObsEnum)[tria_vertex_ids[i]-1]/yts;
-                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
+                                for(i=0;i<3;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
-                                this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs));
                                 if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
                         }