Changeset 4492

Timestamp:

07/08/10 19:37:01 (15 years ago)

Author:

Eric.Larour

Message:

UpdateFromDakota not needed

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)
• Elements/Tria.h (modified) (1 diff)
• Loads/Pengrid.cpp (modified) (1 diff)
• Loads/Pengrid.h (modified) (1 diff)
• Vertex.cpp (modified) (1 diff)
• Vertex.h (modified) (1 diff)

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

@@ -2044 +2044 @@
         /*output error if not found*/
         ISSMERROR("Node not found in Penta");
-}
-/*}}}*/
-/*FUNCTION Penta::UpdateFromDakota {{{1*/
-void  Penta::UpdateFromDakota(void* vinputs){
-
-        ISSMERROR("not supported yet!");
-
 }
 /*}}}*/

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

@@ -194 +194 @@
                 Tria*     SpawnTria(int g0, int g1, int g2);
                 void      SurfaceNormal(double* surface_normal, double xyz_list[3][3]);
-                void      UpdateFromDakota(void* inputs);
                 void      VecExtrude(Vec vector,double* vector_serial,int iscollapsed);
                 /*}}}*/

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

@@ -5981 +5981 @@
 }
 /*}}}*/
-/*FUNCTION Tria::UpdateFromDakota {{{1*/
-void  Tria::UpdateFromDakota(void* vinputs){
-
-        int     i;
-        int     dofs[1]={0};
-        double  temperature_list[3];
-        double  temperature_average;
-        double  B_list[3];
-        double  B_average;
-        double  new_h[3];
-
-        /*Update internal data if inputs holds new values: */
-        /*inputs->Recover("thickness",&this->properties.h[0],1,dofs,3,(void**)nodes);
-        if(inputs->Recover("thickness",&new_h[0],1,dofs,3,(void**)nodes)){
-        //density, needed later:
-        double di=(this->matpar->GetRhoIce()/this->matpar->GetRhoWater());
-        //Go through grids:
-        for (i=0;i<3;i++){
-        if(nodes[i]->IsOnShelf()){
-        this->b[i]=this->b[i]-di*(new_h[i]-h[i]); //hydrostatic equilibrium;
-        }
-        this->s[i]=this->b[i]+new_h[i];
-        this->h[i]=new_h[i];
-        }
-        }*/
-
-        ISSMERROR("not supported yet!");
-
-}
-/*}}}*/

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

@@ -171 +171 @@
                 void*     SpawnSing(int g0);
                 void      SurfaceNormal(double* surface_normal, double xyz_list[3][3]);
-                void      UpdateFromDakota(void* inputs);
                 /*}}}*/
 

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -788 +788 @@
 }
 /*}}}1*/
-/*FUNCTION Pengrid::UpdateFromDakota {{{1*/
-void  Pengrid::UpdateFromDakota(void* inputs){
-        ISSMERROR("not supported yet!");
-}
-/*}}}1*/
 /*FUNCTION Pengrid::UpdateInputs {{{1*/
 void  Pengrid::UpdateInputs(double* solution){

issm/trunk/src/c/objects/Loads/Pengrid.h

@@ -77 +77 @@
                 void  PenaltyConstrain(int* punstable);
                 void  PenaltyConstrainThermal(int* punstable);
-                void  UpdateFromDakota(void* inputs);
                 void  UpdateInputs(double* solution);
                 /*}}}*/

issm/trunk/src/c/objects/Vertex.cpp

@@ -273 +273 @@
 int    Vertex::Sid(void){ return sid; }
 /*}}}*/
-/*FUNCTION UpdateFromDakota {{{1*/
-void  Vertex::UpdateFromDakota(void* vinputs){
-
-        ISSMERROR("not supported yet!");
-        
-}
-/*}}}*/
 /*FUNCTION UpdateVertexPosition {{{1*/
 void  Vertex::UpdatePosition(double* thickness,double* bed){

issm/trunk/src/c/objects/Vertex.h

@@ -60 +60 @@
                 /*Vertex management: {{{1*/
                 int   Sid(void); 
-                void  UpdateFromDakota(void* vinputs);
                 void  UpdatePosition(double* thickness,double* bed);
                 /*}}}*/