Changeset 3834


Ignore:
Timestamp:
05/19/10 07:50:53 (15 years ago)
Author:
Mathieu Morlighem
Message:

almost there

Location:
issm/trunk/src/c/objects
Files:
30 edited

Legend:

Unmodified
Added
Removed

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

    r3833 r3834  
    381381        /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */
    382382        if (analysis_type==ControlAnalysisEnum){
    383                
    384383                UpdateInputsFromSolutionDiagnosticHoriz( solution,analysis_type,sub_analysis_type);
    385384        }
    386385        else if (analysis_type==DiagnosticAnalysisEnum){
    387        
    388386                if (sub_analysis_type==HorizAnalysisEnum){
    389 
    390387                        UpdateInputsFromSolutionDiagnosticHoriz( solution,analysis_type,sub_analysis_type);
    391388                }
    392389                else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
    393 
    394390        }
    395391        else if (analysis_type==SlopecomputeAnalysisEnum){
    396 
    397392                UpdateInputsFromSolutionSlopeCompute( solution,analysis_type,sub_analysis_type);
    398393        }
    399394        else if (analysis_type==PrognosticAnalysisEnum){
    400 
    401395                UpdateInputsFromSolutionPrognostic( solution,analysis_type,sub_analysis_type);
    402396        }
    403397        else if (analysis_type==Prognostic2AnalysisEnum){
    404 
    405398                UpdateInputsFromSolutionPrognostic2(solution,analysis_type,sub_analysis_type);
    406399        }
    407400        else if (analysis_type==BalancedthicknessAnalysisEnum){
    408 
    409401                UpdateInputsFromSolutionBalancedthickness( solution,analysis_type,sub_analysis_type);
    410402        }
    411403        else if (analysis_type==Balancedthickness2AnalysisEnum){
    412 
    413404                UpdateInputsFromSolutionBalancedthickness2( solution,analysis_type,sub_analysis_type);
    414405        }
    415406        else if (analysis_type==BalancedvelocitiesAnalysisEnum){
    416 
    417407                UpdateInputsFromSolutionBalancedvelocities( solution,analysis_type,sub_analysis_type);
    418408        }
    419409        else{
    420 
    421410                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
    422411        }
    … …  
    425414/*FUNCTION Tria::UpdateInputsFromSolutionDiagnosticHoriz {{{1*/
    426415void  Tria::UpdateInputsFromSolutionDiagnosticHoriz(double* solution, int analysis_type, int sub_analysis_type){
    427        
    428416       
    429417        int i;
    … …  
    495483}
    496484/*}}}*/
    497 /*FUNCTION Tria::GetSolutionFromInputs(Vec solution,  int analysis_type,int sub_analysis_type);{{{1*/
     485/*FUNCTION Tria::GetSolutionFromInputs(Vec solution,  int analysis_type,int sub_analysis_type){{{1*/
    498486void  Tria::GetSolutionFromInputs(Vec solution,  int analysis_type,int sub_analysis_type){
    499         ISSMERROR(" not supported yet!");
     487        /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */
     488        if (analysis_type==DiagnosticAnalysisEnum){
     489                if (sub_analysis_type==HorizAnalysisEnum){
     490                        GetSolutionFromInputsDiagnosticHoriz(solution,analysis_type,sub_analysis_type);
     491                }
     492                else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
     493        }
     494        else{
     495                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
     496        }
     497}
     498/*}}}*/
     499/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution, int analysis_type,int sub_analysis_type){{{1*/
     500void  Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution,int analysis_type,int sub_analysis_type){
     501
     502        int i;
     503
     504        const int    numvertices=3;
     505        const int    numdofpervertex=2;
     506        const int    numdof=numdofpervertex*numvertices;
     507        double       gauss[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}};
     508
     509        int          doflist[numdof];
     510        double       values[numdof];
     511        double       vx;
     512        double       vy;
     513
     514        int          dummy;
     515
     516        /*Get dof list: */
     517        GetDofList(&doflist[0],&dummy);
     518
     519        /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
     520        /*P1 element only for now*/
     521        for(i=0;i<numvertices;i++){
     522
     523                /*Recover vx and vy*/
     524                inputs->GetParameterValue(&vx,&gauss[i][0],VxEnum);
     525                inputs->GetParameterValue(&vy,&gauss[i][0],VyEnum);
     526                values[i*numdofpervertex+0]=vx;
     527                values[i*numdofpervertex+1]=vy;
     528        }
     529
     530        /*Add value to global vector*/
     531        VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES);
     532
    500533}
    501534/*}}}*/
    … …  
    46114644}
    46124645/*}}}*/
     4646/*FUNCTION Tria::UpdateInputsFromConstant(int value, int name);{{{1*/
     4647void  Tria::UpdateInputsFromConstant(int constant, int name){
     4648        /*Nothing updated for now*/
     4649}
     4650/*}}}*/

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

    r3828 r3834  
    5858                void  CreatePVector(Vec pg,  int analysis_type,int sub_analysis_type);
    5959                void  GetSolutionFromInputs(Vec solution,  int analysis_type,int sub_analysis_type);
     60                void  GetSolutionFromInputsDiagnosticHoriz(Vec solution,int analysis_type,int sub_analysis_type);
    6061                void  GetDofList(int* doflist,int* pnumberofdofs);
    6162                void  GetDofList1(int* doflist);
    … …  
    130131                void  UpdateInputsFromVector(int* vector, int name, int type);
    131132                void  UpdateInputsFromVector(bool* vector, int name, int type);
    132                 void  UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    133                 void  UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    134                 void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    135                 void  pdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
     133                void  UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");};
     134                void  UpdateInputsFromConstant(int constant, int name);
     135                void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");};
    136136                /*}}}*/
    137137

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

    r3788 r3834  
    13491349}
    13501350/*}}}*/
     1351/*FUNCTION Icefront::UpdateInputsFromConstant(int constant, int name) {{{1*/
     1352void Icefront::UpdateInputsFromConstant(int constant, int name){
     1353
     1354        /*Nothing updated for now*/
     1355}
     1356/*}}}*/

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

    r3751 r3834  
    5454                void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    5555                void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
     56                void    UpdateInputsFromConstant(int constant, int name);
    5757                void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    5858

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

    r3784 r3834  
    438438}
    439439/*}}}*/
     440/*FUNCTION Matice::UpdateInputsFromConstant(int constant, int name){{{1*/
     441void  Matice::UpdateInputsFromConstant(int constant, int name){
     442
     443        /*Nothing updated for now*/
     444
     445}
     446/*}}}*/

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

    r3751 r3834  
    4949                void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    5050                void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    51                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
     51                void    UpdateInputsFromConstant(int constant, int name);
    5252                void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    5353                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}

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

    r3775 r3834  
    282282}
    283283/*}}}1*/
     284/*FUNCTION Matpar::UpdateInputsFromConstant(int constant, int name){{{1*/
     285void Matpar::UpdateInputsFromConstant(int constant, int name){
     286
     287        /*Nothing updated for now*/
     288}
     289/*}}}1*/

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

    r3751 r3834  
    5757                double GetMeltingPoint();
    5858                Object* copy();
    59                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    60                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    61                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    62                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    63                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    64                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     59                void   UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     60                void   UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     61                void   UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     62                void   UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
     63                void   UpdateInputsFromConstant(int constant, int name);
     64                void   UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    6565
    66                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     66                void   UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6767
    6868

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

    r3808 r3834  
    882882}
    883883/*}}}*/
     884/*FUNCTION Node::UpdateInputsFromConstant(int constant, int name){{{2*/
     885void  Node::UpdateInputsFromConstant(int constant, int name){
     886        /*nothing updated for now*/
     887}
     888/*}}}*/
    884889/*}}}*/
    885890/* DofObject routines: {{{1*/

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

    r3751 r3834  
    5151                int   MyRank(void);
    5252                void  SetVertexDof(int in_dof);
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     54                void  UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     55                void  UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
     56                void  UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

  • issm/trunk/src/c/objects/Params/BoolParam.cpp

    r3792 r3834  
    143143#endif
    144144/*}}}*/
     145
     146/*FUNCTION BoolParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     147void  BoolParam::UpdateInputsFromVector(double* vector, int name, int type){
     148        /*Nothing updated yet*/
     149}
     150/*}}}*/
     151/*FUNCTION BoolParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     152void  BoolParam::UpdateInputsFromVector(int* vector, int name, int type){
     153        /*Nothing updated yet*/
     154}
     155/*}}}*/
     156/*FUNCTION BoolParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     157void  BoolParam::UpdateInputsFromVector(bool* vector, int name, int type){
     158        /*Nothing updated yet*/
     159}
     160/*}}}*/
     161/*FUNCTION BoolParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     162void  BoolParam::UpdateInputsFromConstant(double constant, int name){
     163        /*Nothing updated yet*/
     164}
     165/*}}}*/
     166/*FUNCTION BoolParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     167void  BoolParam::UpdateInputsFromConstant(int constant, int name){
     168        /*Nothing updated yet*/
     169}
     170/*}}}*/
     171/*FUNCTION BoolParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     172void  BoolParam::UpdateInputsFromConstant(bool constant, int name){
     173        /*Nothing updated yet*/
     174}
     175/*}}}*/

  • issm/trunk/src/c/objects/Params/BoolParam.h

    r3775 r3834  
    5050                int   MarshallSize();
    5151                int   MyRank();
    52                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    53                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     52                void  UpdateInputsFromVector(double* vector, int name, int type);
     53                void  UpdateInputsFromVector(int* vector, int name, int type);
     54                void  UpdateInputsFromVector(bool* vector, int name, int type);
     55                void  UpdateInputsFromConstant(double constant, int name);
     56                void  UpdateInputsFromConstant(int constant, int name);
     57                void  UpdateInputsFromConstant(bool constant, int name);
    5858
    59                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     59                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6060
    6161                /*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleMatParam.cpp

    r3792 r3834  
    199199#endif
    200200/*}}}*/
     201
     202/*FUNCTION DoubleMatParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     203void  DoubleMatParam::UpdateInputsFromVector(double* vector, int name, int type){
     204        /*Nothing updated yet*/
     205}
     206/*}}}*/
     207/*FUNCTION DoubleMatParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     208void  DoubleMatParam::UpdateInputsFromVector(int* vector, int name, int type){
     209        /*Nothing updated yet*/
     210}
     211/*}}}*/
     212/*FUNCTION DoubleMatParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     213void  DoubleMatParam::UpdateInputsFromVector(bool* vector, int name, int type){
     214        /*Nothing updated yet*/
     215}
     216/*}}}*/
     217/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     218void  DoubleMatParam::UpdateInputsFromConstant(double constant, int name){
     219        /*Nothing updated yet*/
     220}
     221/*}}}*/
     222/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     223void  DoubleMatParam::UpdateInputsFromConstant(int constant, int name){
     224        /*Nothing updated yet*/
     225}
     226/*}}}*/
     227/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     228void  DoubleMatParam::UpdateInputsFromConstant(bool constant, int name){
     229        /*Nothing updated yet*/
     230}
     231/*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleMatParam.h

    r3775 r3834  
    5353                int   MarshallSize();
    5454                int   MyRank();
    55                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    59                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    60                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     55                void  UpdateInputsFromVector(double* vector, int name, int type);
     56                void  UpdateInputsFromVector(int* vector, int name, int type);
     57                void  UpdateInputsFromVector(bool* vector, int name, int type);
     58                void  UpdateInputsFromConstant(double constant, int name);
     59                void  UpdateInputsFromConstant(int constant, int name);
     60                void  UpdateInputsFromConstant(bool constant, int name);
    6161
    62                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     62                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6363
    6464                /*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleParam.cpp

    r3792 r3834  
    141141#endif
    142142/*}}}*/
     143
     144/*FUNCTION DoubleParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     145void  DoubleParam::UpdateInputsFromVector(double* vector, int name, int type){
     146        /*Nothing updated yet*/
     147}
     148/*}}}*/
     149/*FUNCTION DoubleParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     150void  DoubleParam::UpdateInputsFromVector(int* vector, int name, int type){
     151        /*Nothing updated yet*/
     152}
     153/*}}}*/
     154/*FUNCTION DoubleParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     155void  DoubleParam::UpdateInputsFromVector(bool* vector, int name, int type){
     156        /*Nothing updated yet*/
     157}
     158/*}}}*/
     159/*FUNCTION DoubleParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     160void  DoubleParam::UpdateInputsFromConstant(double constant, int name){
     161        /*Nothing updated yet*/
     162}
     163/*}}}*/
     164/*FUNCTION DoubleParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     165void  DoubleParam::UpdateInputsFromConstant(int constant, int name){
     166        /*Nothing updated yet*/
     167}
     168/*}}}*/
     169/*FUNCTION DoubleParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     170void  DoubleParam::UpdateInputsFromConstant(bool constant, int name){
     171        /*Nothing updated yet*/
     172}
     173/*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleParam.h

    r3775 r3834  
    5151                int   MarshallSize();
    5252                int   MyRank();
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type);
     54                void  UpdateInputsFromVector(int* vector, int name, int type);
     55                void  UpdateInputsFromVector(bool* vector, int name, int type);
     56                void  UpdateInputsFromConstant(double constant, int name);
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name);
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

    r3792 r3834  
    209209#endif
    210210/*}}}*/
     211
     212/*FUNCTION DoubleVecParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     213void  DoubleVecParam::UpdateInputsFromVector(double* vector, int name, int type){
     214        /*Nothing updated yet*/
     215}
     216/*}}}*/
     217/*FUNCTION DoubleVecParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     218void  DoubleVecParam::UpdateInputsFromVector(int* vector, int name, int type){
     219        /*Nothing updated yet*/
     220}
     221/*}}}*/
     222/*FUNCTION DoubleVecParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     223void  DoubleVecParam::UpdateInputsFromVector(bool* vector, int name, int type){
     224        /*Nothing updated yet*/
     225}
     226/*}}}*/
     227/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     228void  DoubleVecParam::UpdateInputsFromConstant(double constant, int name){
     229        /*Nothing updated yet*/
     230}
     231/*}}}*/
     232/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     233void  DoubleVecParam::UpdateInputsFromConstant(int constant, int name){
     234        /*Nothing updated yet*/
     235}
     236/*}}}*/
     237/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     238void  DoubleVecParam::UpdateInputsFromConstant(bool constant, int name){
     239        /*Nothing updated yet*/
     240}
     241/*}}}*/

  • issm/trunk/src/c/objects/Params/DoubleVecParam.h

    r3775 r3834  
    5252                int   MarshallSize();
    5353                int   MyRank();
    54                 void  UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void  UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void  UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    59                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     54                void  UpdateInputsFromVector(double* vector, int name, int type);
     55                void  UpdateInputsFromVector(int* vector, int name, int type);
     56                void  UpdateInputsFromVector(bool* vector, int name, int type);
     57                void  UpdateInputsFromConstant(double constant, int name);
     58                void  UpdateInputsFromConstant(int constant, int name);
     59                void  UpdateInputsFromConstant(bool constant, int name);
    6060
    6161                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}

  • issm/trunk/src/c/objects/Params/IntParam.cpp

    r3792 r3834  
    144144#endif
    145145/*}}}*/
     146
     147/*FUNCTION IntParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     148void  IntParam::UpdateInputsFromVector(double* vector, int name, int type){
     149        /*Nothing updated yet*/
     150}
     151/*}}}*/
     152/*FUNCTION IntParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     153void  IntParam::UpdateInputsFromVector(int* vector, int name, int type){
     154        /*Nothing updated yet*/
     155}
     156/*}}}*/
     157/*FUNCTION IntParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     158void  IntParam::UpdateInputsFromVector(bool* vector, int name, int type){
     159        /*Nothing updated yet*/
     160}
     161/*}}}*/
     162/*FUNCTION IntParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     163void  IntParam::UpdateInputsFromConstant(double constant, int name){
     164        /*Nothing updated yet*/
     165}
     166/*}}}*/
     167/*FUNCTION IntParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     168void  IntParam::UpdateInputsFromConstant(int constant, int name){
     169        /*Nothing updated yet*/
     170}
     171/*}}}*/
     172/*FUNCTION IntParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     173void  IntParam::UpdateInputsFromConstant(bool constant, int name){
     174        /*Nothing updated yet*/
     175}
     176/*}}}*/

  • issm/trunk/src/c/objects/Params/IntParam.h

    r3775 r3834  
    5151                int   MarshallSize();
    5252                int   MyRank();
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type);
     54                void  UpdateInputsFromVector(int* vector, int name, int type);
     55                void  UpdateInputsFromVector(bool* vector, int name, int type);
     56                void  UpdateInputsFromConstant(double constant, int name);
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name);
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

  • issm/trunk/src/c/objects/Params/PetscMatParam.cpp

    r3792 r3834  
    226226#endif
    227227/*}}}*/
     228
     229/*FUNCTION PetscMatParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     230void  PetscMatParam::UpdateInputsFromVector(double* vector, int name, int type){
     231        /*Nothing updated yet*/
     232}
     233/*}}}*/
     234/*FUNCTION PetscMatParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     235void  PetscMatParam::UpdateInputsFromVector(int* vector, int name, int type){
     236        /*Nothing updated yet*/
     237}
     238/*}}}*/
     239/*FUNCTION PetscMatParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     240void  PetscMatParam::UpdateInputsFromVector(bool* vector, int name, int type){
     241        /*Nothing updated yet*/
     242}
     243/*}}}*/
     244/*FUNCTION PetscMatParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     245void  PetscMatParam::UpdateInputsFromConstant(double constant, int name){
     246        /*Nothing updated yet*/
     247}
     248/*}}}*/
     249/*FUNCTION PetscMatParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     250void  PetscMatParam::UpdateInputsFromConstant(int constant, int name){
     251        /*Nothing updated yet*/
     252}
     253/*}}}*/
     254/*FUNCTION PetscMatParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     255void  PetscMatParam::UpdateInputsFromConstant(bool constant, int name){
     256        /*Nothing updated yet*/
     257}
     258/*}}}*/

  • issm/trunk/src/c/objects/Params/PetscMatParam.h

    r3775 r3834  
    5151                int   MarshallSize();
    5252                int   MyRank();
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type);
     54                void  UpdateInputsFromVector(int* vector, int name, int type);
     55                void  UpdateInputsFromVector(bool* vector, int name, int type);
     56                void  UpdateInputsFromConstant(double constant, int name);
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name);
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

  • issm/trunk/src/c/objects/Params/PetscVecParam.cpp

    r3792 r3834  
    220220#endif
    221221/*}}}*/
     222
     223/*FUNCTION PetscVecParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     224void  PetscVecParam::UpdateInputsFromVector(double* vector, int name, int type){
     225        /*Nothing updated yet*/
     226}
     227/*}}}*/
     228/*FUNCTION PetscVecParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     229void  PetscVecParam::UpdateInputsFromVector(int* vector, int name, int type){
     230        /*Nothing updated yet*/
     231}
     232/*}}}*/
     233/*FUNCTION PetscVecParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     234void  PetscVecParam::UpdateInputsFromVector(bool* vector, int name, int type){
     235        /*Nothing updated yet*/
     236}
     237/*}}}*/
     238/*FUNCTION PetscVecParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     239void  PetscVecParam::UpdateInputsFromConstant(double constant, int name){
     240        /*Nothing updated yet*/
     241}
     242/*}}}*/
     243/*FUNCTION PetscVecParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     244void  PetscVecParam::UpdateInputsFromConstant(int constant, int name){
     245        /*Nothing updated yet*/
     246}
     247/*}}}*/
     248/*FUNCTION PetscVecParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     249void  PetscVecParam::UpdateInputsFromConstant(bool constant, int name){
     250        /*Nothing updated yet*/
     251}
     252/*}}}*/

  • issm/trunk/src/c/objects/Params/PetscVecParam.h

    r3775 r3834  
    5151                int   MarshallSize();
    5252                int   MyRank();
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type);
     54                void  UpdateInputsFromVector(int* vector, int name, int type);
     55                void  UpdateInputsFromVector(bool* vector, int name, int type);
     56                void  UpdateInputsFromConstant(double constant, int name);
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name);
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

  • issm/trunk/src/c/objects/Params/StringArrayParam.cpp

    r3792 r3834  
    249249#endif
    250250/*}}}*/
     251
     252/*FUNCTION StringArrayParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     253void  StringArrayParam::UpdateInputsFromVector(double* vector, int name, int type){
     254        /*Nothing updated yet*/
     255}
     256/*}}}*/
     257/*FUNCTION StringArrayParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     258void  StringArrayParam::UpdateInputsFromVector(int* vector, int name, int type){
     259        /*Nothing updated yet*/
     260}
     261/*}}}*/
     262/*FUNCTION StringArrayParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     263void  StringArrayParam::UpdateInputsFromVector(bool* vector, int name, int type){
     264        /*Nothing updated yet*/
     265}
     266/*}}}*/
     267/*FUNCTION StringArrayParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     268void  StringArrayParam::UpdateInputsFromConstant(double constant, int name){
     269        /*Nothing updated yet*/
     270}
     271/*}}}*/
     272/*FUNCTION StringArrayParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     273void  StringArrayParam::UpdateInputsFromConstant(int constant, int name){
     274        /*Nothing updated yet*/
     275}
     276/*}}}*/
     277/*FUNCTION StringArrayParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     278void  StringArrayParam::UpdateInputsFromConstant(bool constant, int name){
     279        /*Nothing updated yet*/
     280}
     281/*}}}*/

  • issm/trunk/src/c/objects/Params/StringArrayParam.h

    r3775 r3834  
    5353                int   MarshallSize();
    5454                int   MyRank();
    55                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    59                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    60                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     55                void  UpdateInputsFromVector(double* vector, int name, int type);
     56                void  UpdateInputsFromVector(int* vector, int name, int type);
     57                void  UpdateInputsFromVector(bool* vector, int name, int type);
     58                void  UpdateInputsFromConstant(double constant, int name);
     59                void  UpdateInputsFromConstant(int constant, int name);
     60                void  UpdateInputsFromConstant(bool constant, int name);
    6161
    62                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     62                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6363
    6464                /*}}}*/

  • issm/trunk/src/c/objects/Params/StringParam.cpp

    r3792 r3834  
    175175#endif
    176176/*}}}*/
     177
     178/*FUNCTION StringParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/
     179void  StringParam::UpdateInputsFromVector(double* vector, int name, int type){
     180        /*Nothing updated yet*/
     181}
     182/*}}}*/
     183/*FUNCTION StringParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/
     184void  StringParam::UpdateInputsFromVector(int* vector, int name, int type){
     185        /*Nothing updated yet*/
     186}
     187/*}}}*/
     188/*FUNCTION StringParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/
     189void  StringParam::UpdateInputsFromVector(bool* vector, int name, int type){
     190        /*Nothing updated yet*/
     191}
     192/*}}}*/
     193/*FUNCTION StringParam::UpdateInputsFromConstant(double constant, int name) {{{1*/
     194void  StringParam::UpdateInputsFromConstant(double constant, int name){
     195        /*Nothing updated yet*/
     196}
     197/*}}}*/
     198/*FUNCTION StringParam::UpdateInputsFromConstant(int constant, int name) {{{1*/
     199void  StringParam::UpdateInputsFromConstant(int constant, int name){
     200        /*Nothing updated yet*/
     201}
     202/*}}}*/
     203/*FUNCTION StringParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/
     204void  StringParam::UpdateInputsFromConstant(bool constant, int name){
     205        /*Nothing updated yet*/
     206}
     207/*}}}*/

  • issm/trunk/src/c/objects/Params/StringParam.h

    r3775 r3834  
    5151                int   MarshallSize();
    5252                int   MyRank();
    53                 void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    54                 void    UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    58                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     53                void  UpdateInputsFromVector(double* vector, int name, int type);
     54                void  UpdateInputsFromVector(int* vector, int name, int type);
     55                void  UpdateInputsFromVector(bool* vector, int name, int type);
     56                void  UpdateInputsFromConstant(double constant, int name);
     57                void  UpdateInputsFromConstant(int constant, int name);
     58                void  UpdateInputsFromConstant(bool constant, int name);
    5959
    60                 void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
     60                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
    6161
    6262                /*}}}*/

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

    r3784 r3834  
    182182}
    183183/*}}}*/
     184/*FUNCTION UpdateInputsFromConstant(int constant, int name){{{2*/
     185void  Vertex::UpdateInputsFromConstant(int constant, int name){
     186
     187        /*Nothing updated for now*/
     188
     189}
     190/*}}}*/
    184191/*}}}*/
    185192/* DofObject routines: {{{1*/

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

    r3775 r3834  
    5353                void  UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    5454                void  UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
    55                 void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
    56                 void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
    57                 void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
     55                void  UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
     56                void  UpdateInputsFromConstant(int constant, int name);
     57                void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
    5858
    5959                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
Note: See TracChangeset for help on using the changeset viewer.