Changeset 5311


Ignore:
Timestamp:
08/17/10 11:13:09 (15 years ago)
Author:
Eric.Larour
Message:

Created new method for updating Dakota vectors into the elements with a
new InputUpdateFromVectorDakotax module. For now, does exactly InputUpdateFromVectorx
did. Will introduce Dakota specialty code in these new routines in the future.

Location:
issm/trunk/src/c
Files:
20 edited
2 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/Makefile.am

    r5286 r5311  
    465465                                        ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\
    466466                                        ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\
     467                                        ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\
     468                                        ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\
    467469                                        ./modules/UpdateGeometryx/UpdateGeometryx.h\
    468470                                        ./modules/UpdateGeometryx/UpdateGeometryx.cpp\
    … …  
    10101012                                        ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\
    10111013                                        ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\
     1014                                        ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\
     1015                                        ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\
    10121016                                        ./modules/UpdateGeometryx/UpdateGeometryx.h\
    10131017                                        ./modules/UpdateGeometryx/UpdateGeometryx.cpp\

  • issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp

    r5307 r5311  
    1 /*!\file InputUpdateFromVectorx
     1/*!\file InputUpdateFromVectorDakotax
    22 * \brief: update datasets using  parameter inputs
    33 */
    44
    5 #include "./InputUpdateFromVectorx.h"
     5#include "./InputUpdateFromVectorDakotax.h"
    66#include "../../shared/shared.h"
    77#include "../../include/include.h"
    … …  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){
     11void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){
    1212
    1313        double* serial_vector=NULL;
    … …  
    1515        VecToMPISerial(&serial_vector,vector);
    1616
    17         InputUpdateFromVectorx( elements,nodes, vertices, loads, materials, parameters,serial_vector,NameEnum, TypeEnum);
     17        InputUpdateFromVectorDakotax( elements,nodes, vertices, loads, materials, parameters,serial_vector,NameEnum, TypeEnum);
    1818
    1919        /*Free ressources:*/
    … …  
    2222
    2323       
    24 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
     24void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
    2525
    2626        int i;
    … …  
    2929        for(i=0;i<elements->Size();i++){
    3030                Element* element=(Element*)elements->GetObjectByOffset(i);
    31                 element->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     31                element->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    3232        }
    3333        for(i=0;i<nodes->Size();i++){
    3434                Node* node=(Node*)nodes->GetObjectByOffset(i);
    35                 node->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     35                node->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    3636        }
    3737        for(i=0;i<loads->Size();i++){
    3838                Load* load=(Load*)loads->GetObjectByOffset(i);
    39                 load->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     39                load->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    4040        }
    4141        for(i=0;i<materials->Size();i++){
    4242                Material* material=(Material*)materials->GetObjectByOffset(i);
    43                 material->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     43                material->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    4444        }
    4545}
    4646
    47 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){
     47void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){
    4848       
    4949        int i;
    … …  
    5252        for(i=0;i<elements->Size();i++){
    5353                Element* element=(Element*)elements->GetObjectByOffset(i);
    54                 element->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     54                element->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    5555        }
    5656        for(i=0;i<nodes->Size();i++){
    5757                Node* node=(Node*)nodes->GetObjectByOffset(i);
    58                 node->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     58                node->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    5959        }
    6060        for(i=0;i<loads->Size();i++){
    6161                Load* load=(Load*)loads->GetObjectByOffset(i);
    62                 load->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     62                load->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    6363        }
    6464        for(i=0;i<materials->Size();i++){
    6565                Material* material=(Material*)materials->GetObjectByOffset(i);
    66                 material->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     66                material->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    6767        }
    6868}
    6969
    70 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){
     70void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){
    7171
    7272        int i;
    … …  
    7575        for(i=0;i<elements->Size();i++){
    7676                Element* element=(Element*)elements->GetObjectByOffset(i);
    77                 element->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     77                element->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    7878        }
    7979        for(i=0;i<nodes->Size();i++){
    8080                Node* node=(Node*)nodes->GetObjectByOffset(i);
    81                 node->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     81                node->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    8282        }
    8383        for(i=0;i<loads->Size();i++){
    8484                Load* load=(Load*)loads->GetObjectByOffset(i);
    85                 load->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     85                load->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    8686        }
    8787        for(i=0;i<materials->Size();i++){
    8888                Material* material=(Material*)materials->GetObjectByOffset(i);
    89                 material->InputUpdateFromVector(vector,NameEnum,TypeEnum);
     89                material->InputUpdateFromVectorDakota(vector,NameEnum,TypeEnum);
    9090        }
    9191}

  • issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h

    r5307 r5311  
    1 /*!\file:  InputUpdateFromVectorx.h
     1/*!\file:  InputUpdateFromVectorDakotax.h
    22 * \brief header file for updating datasets from inputs
    33 */
    44
    5 #ifndef _UPDATEINPUTSFROMVECTORXX_H
    6 #define _UPDATEINPUTSFROMVECTORXX_H
     5#ifndef _UPDATEINPUTSFROMVECTORDAKOTAXX_H
     6#define _UPDATEINPUTSFROMVECTORDAKOTAXX_H
    77
    88#include "../../objects/objects.h"
    … …  
    1010
    1111/* local prototypes: */
    12 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);
    13 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
    14 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int* vector, int NameEnum,int TypeEnum);
    15 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);
     12void    InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);
     13void    InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
     14void    InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int* vector, int NameEnum,int TypeEnum);
     15void    InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);
    1616
    17 #endif  /* _UPDATEINPUTSFROMVECTORXX_H */
     17#endif  /* _UPDATEINPUTSFROMVECTORDAKOTAXX_H */
    1818

  • issm/trunk/src/c/modules/modules.h

    r5286 r5311  
    4040#include "./InputUpdateFromDakotax/InputUpdateFromDakotax.h"
    4141#include "./InputUpdateFromVectorx/InputUpdateFromVectorx.h"
     42#include "./InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h"
    4243#include "./MassFluxx/MassFluxx.h"
    4344#include "./MaxAbsVxx/MaxAbsVxx.h"

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

    r5290 r5311  
    443443/*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/
    444444void  Penta::InputUpdateFromVector(bool* vector, int name, int type){
     445        ISSMERROR(" not supported yet!");
     446}
     447/*}}}*/
     448/*FUNCTION Penta::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/
     449void  Penta::InputUpdateFromVectorDakota(double* vector, int name, int type){
     450
     451        /*Check that name is an element input*/
     452        if (!IsInput(name)) return;
     453
     454        switch(type){
     455
     456                case VertexEnum:
     457
     458                        /*New PentaVertexInpu*/
     459                        double values[6];
     460
     461                        /*Get values on the 6 vertices*/
     462                        for (int i=0;i<6;i++){
     463                                values[i]=vector[this->nodes[i]->GetVertexDof()];
     464                        }
     465
     466                        /*update input*/
     467                        this->inputs->AddInput(new PentaVertexInput(name,values));
     468                        return;
     469
     470                default:
     471
     472                        ISSMERROR("type %i (%s) not implemented yet",type,EnumToString(type));
     473        }
     474}
     475/*}}}*/
     476/*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/
     477void  Penta::InputUpdateFromVectorDakota(int* vector, int name, int type){
     478        ISSMERROR(" not supported yet!");
     479}
     480/*}}}*/
     481/*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/
     482void  Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    445483        ISSMERROR(" not supported yet!");
    446484}

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

    r5286 r5311  
    6464                void  InputUpdateFromVector(double* vector, int name, int type);
    6565                void  InputUpdateFromVector(int* vector, int name, int type);
     66                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
     67                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     68                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
    6669                /*}}}*/
    6770                /*Element virtual functions definitions: {{{1*/

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

    r5292 r5311  
    440440/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/
    441441void  Tria::InputUpdateFromVector(bool* vector, int name, int type){
     442        ISSMERROR(" not supported yet!");
     443}
     444/*}}}*/
     445/*FUNCTION Tria::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/
     446void  Tria::InputUpdateFromVectorDakota(double* vector, int name, int type){
     447
     448        /*Check that name is an element input*/
     449        if (!IsInput(name)) return;
     450
     451        switch(type){
     452
     453                case VertexEnum:
     454
     455                        /*New TriaVertexInput*/
     456                        double values[3];
     457
     458                        /*Get values on the 6 vertices*/
     459                        for (int i=0;i<3;i++){
     460                                values[i]=vector[this->nodes[i]->GetVertexDof()];
     461                        }
     462
     463                        /*update input*/
     464                        if (name==RheologyB2dEnum || name==RheologyBEnum){
     465                                matice->inputs->AddInput(new TriaVertexInput(name,values));
     466                        }
     467                        else{
     468                                this->inputs->AddInput(new TriaVertexInput(name,values));
     469                        }
     470                        return;
     471
     472                default:
     473
     474                        ISSMERROR("type %i (%s) not implemented yet",type,EnumToString(type));
     475        }
     476}
     477/*}}}*/
     478/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/
     479void  Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){
     480        ISSMERROR(" not supported yet!");
     481}
     482/*}}}*/
     483/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/
     484void  Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    442485        ISSMERROR(" not supported yet!");
    443486}

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

    r5286 r5311  
    5858                void  InputUpdateFromVector(int* vector, int name, int type);
    5959                void  InputUpdateFromVector(bool* vector, int name, int type);
     60                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     61                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
     62                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
    6063                void  InputUpdateFromConstant(double constant, int name);
    6164                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Loads/Icefront.cpp

    r5161 r5311  
    334334/*FUNCTION Icefront::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
    335335void  Icefront::InputUpdateFromVector(bool* vector, int name, int type){
     336        /*Nothing updated yet*/
     337}
     338/*}}}*/
     339/*FUNCTION Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     340void  Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type){
     341        /*Nothing updated yet*/
     342}
     343/*}}}*/
     344/*FUNCTION Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     345void  Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type){
     346        /*Nothing updated yet*/
     347}
     348/*}}}*/
     349/*FUNCTION Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     350void  Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    336351        /*Nothing updated yet*/
    337352}

  • issm/trunk/src/c/objects/Loads/Icefront.h

    r5136 r5311  
    5353                void  InputUpdateFromVector(int* vector, int name, int type);
    5454                void  InputUpdateFromVector(bool* vector, int name, int type);
     55                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     56                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
     57                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
    5558                void  InputUpdateFromConstant(double constant, int name);
    5659                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Loads/Numericalflux.h

    r5292 r5311  
    4848                void    InputUpdateFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    4949                void    InputUpdateFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     50                void    InputUpdateFromVectorDakota(double* vector, int name, int type){/*Do nothing*/}
     51                void    InputUpdateFromVectorDakota(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     52                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    5053                void    InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    5154                void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};

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

    r5152 r5311  
    344344/*FUNCTION Pengrid::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
    345345void  Pengrid::InputUpdateFromVector(bool* vector, int name, int type){
     346        /*Nothing updated yet*/
     347}
     348/*}}}*/
     349/*FUNCTION Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     350void  Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type){
     351        /*Nothing updated yet*/
     352}
     353/*}}}*/
     354/*FUNCTION Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     355void  Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type){
     356        /*Nothing updated yet*/
     357}
     358/*}}}*/
     359/*FUNCTION Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     360void  Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    346361        /*Nothing updated yet*/
    347362}

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

    r5096 r5311  
    5454                void  InputUpdateFromVector(int* vector, int name, int type);
    5555                void  InputUpdateFromVector(bool* vector, int name, int type);
     56                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     57                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
     58                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
    5659                void  InputUpdateFromConstant(double constant, int name);
    5760                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Loads/Penpair.h

    r5096 r5311  
    4646                void  InputUpdateFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    4747                void  InputUpdateFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     48                void  InputUpdateFromVectorDakota(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     49                void  InputUpdateFromVectorDakota(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     50                void  InputUpdateFromVectorDakota(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    4851                void  InputUpdateFromConstant(double constant, int name);
    4952                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Loads/Riftfront.h

    r5161 r5311  
    6363                void    InputUpdateFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    6464                void    InputUpdateFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     65                void    InputUpdateFromVectorDakota(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     66                void    InputUpdateFromVectorDakota(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     67                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    6568                void    InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    6669                void    InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Materials/Matice.cpp

    r5152 r5311  
    591591}
    592592/*}}}*/
     593/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     594void  Matice::InputUpdateFromVectorDakota(double* vector, int name, int type){
     595
     596        /*Intermediaries*/
     597        Element *element      = NULL;
     598
     599        /*Recover element*/
     600        element=(Element*)helement->delivers();
     601
     602        /*Check that name is an element input*/
     603        if (!IsInput(name)) return;
     604
     605        switch(type){
     606
     607                case VertexEnum:
     608
     609                        switch(element->Enum()){
     610
     611                                case TriaEnum:
     612                                        double values[3];
     613                                        for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetVertexDof()];
     614                                        this->inputs->AddInput(new TriaVertexInput(name,values));
     615                                        return;
     616
     617                                default: ISSMERROR("element %s not implemented yet",EnumToString(element->Enum()));
     618                        }
     619                default: ISSMERROR("type %i (%s) not implemented yet",type,EnumToString(type));
     620        }
     621}
     622/*}}}*/
     623/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     624void  Matice::InputUpdateFromVectorDakota(int* vector, int name, int type){
     625        /*Nothing updated yet*/
     626}
     627/*}}}*/
     628/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     629void  Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type){
     630        /*Nothing updated yet*/
     631}
     632/*}}}*/
    593633/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{1*/
    594634void  Matice::InputUpdateFromConstant(double constant, int name){

  • issm/trunk/src/c/objects/Materials/Matice.h

    r4967 r5311  
    4545                void  InputUpdateFromVector(int* vector, int name, int type);
    4646                void  InputUpdateFromVector(bool* vector, int name, int type);
     47                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     48                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
     49                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
    4750                void  InputUpdateFromConstant(double constant, int name);
    4851                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Materials/Matpar.cpp

    r4966 r5311  
    219219}
    220220/*}}}*/
     221/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     222void   Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type){
     223        /*Nothing updated yet*/
     224}
     225/*}}}*/
     226/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     227void   Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type){
     228        /*Nothing updated yet*/
     229}
     230/*}}}*/
     231/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     232void   Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type){
     233        /*Nothing updated yet*/
     234}
     235/*}}}*/
    221236/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{1*/
    222237void   Matpar::InputUpdateFromConstant(double constant, int name){

  • issm/trunk/src/c/objects/Materials/Matpar.h

    r4967 r5311  
    4949                void   InputUpdateFromVector(int* vector, int name, int type);
    5050                void   InputUpdateFromVector(bool* vector, int name, int type);
     51                void   InputUpdateFromVectorDakota(double* vector, int name, int type);
     52                void   InputUpdateFromVectorDakota(int* vector, int name, int type);
     53                void   InputUpdateFromVectorDakota(bool* vector, int name, int type);
    5154                void   InputUpdateFromConstant(double constant, int name);
    5255                void   InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Node.cpp

    r5259 r5311  
    587587}
    588588/*}}}*/
     589/*FUNCTION Node::InputUpdateFromVectorDakota(double* vector, int name, int type){{{1*/
     590void  Node::InputUpdateFromVectorDakota(double* vector, int name, int type){
     591
     592        /*Nothing updated yet*/
     593}
     594/*}}}*/
     595/*FUNCTION Node::InputUpdateFromVectorDakota(int* vector, int name, int type){{{1*/
     596void  Node::InputUpdateFromVectorDakota(int* vector, int name, int type){
     597
     598        /*Nothing updated yet*/
     599}
     600/*}}}*/
     601/*FUNCTION Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){{{1*/
     602void  Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){
     603
     604        /*Nothing updated yet*/
     605}
     606/*}}}*/
    589607/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{1*/
    590608void  Node::InputUpdateFromConstant(double constant, int name){

  • issm/trunk/src/c/objects/Node.h

    r5259 r5311  
    5555                void  InputUpdateFromVector(int* vector, int name, int type);
    5656                void  InputUpdateFromVector(bool* vector, int name, int type);
     57                void  InputUpdateFromVectorDakota(double* vector, int name, int type);
     58                void  InputUpdateFromVectorDakota(int* vector, int name, int type);
     59                void  InputUpdateFromVectorDakota(bool* vector, int name, int type);
    5760                void  InputUpdateFromConstant(double constant, int name);
    5861                void  InputUpdateFromConstant(int constant, int name);

  • issm/trunk/src/c/objects/Update.h

    r4244 r5311  
    1818                virtual void  InputUpdateFromVector(int* vector, int name, int type)=0;
    1919                virtual void  InputUpdateFromVector(bool* vector, int name, int type)=0;
     20                virtual void  InputUpdateFromVectorDakota(double* vector, int name, int type)=0;
     21                virtual void  InputUpdateFromVectorDakota(int* vector, int name, int type)=0;
     22                virtual void  InputUpdateFromVectorDakota(bool* vector, int name, int type)=0;
    2023                virtual void  InputUpdateFromConstant(double constant, int name)=0;
    2124                virtual void  InputUpdateFromConstant(int constant, int name)=0;
Note: See TracChangeset for help on using the changeset viewer.