Changeset 3971


Ignore:
Timestamp:
05/27/10 11:48:54 (15 years ago)
Author:
Mathieu Morlighem
Message:

moved some DataSet methods to module

Location:
issm/trunk/src/c
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/DataSet/DataSet.cpp

    r3969 r3971  
    10781078}
    10791079/*}}}*/
    1080 /*FUNCTION DataSet::GetSolutionFromInputs{{{1*/
    1081 void  DataSet::GetSolutionFromInputs(Vec solution, int analysis_type, int sub_analysis_type){
    1082 
    1083         vector<Object*>::iterator object;
    1084         Element* element=NULL;
    1085 
    1086         for ( object=objects.begin() ; object < objects.end(); object++ ){
    1087 
    1088                 if(EnumIsElement((*object)->Enum())){
    1089 
    1090                         element=(Element*)(*object);
    1091                         element->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
    1092                 }
    1093                 else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!");
    1094         }
    1095 }
    1096 /*}}}*/
    10971080/*FUNCTION DataSet::UpdateInputsFromConstant{{{1*/
    10981081void  DataSet::UpdateInputsFromConstant(double constant, int name){
  • issm/trunk/src/c/DataSet/DataSet.h

    r3970 r3971  
    7575                void  UpdateInputsFromVector(int* vector,int name, int type);
    7676                void  UpdateInputsFromVector(bool* vector,int name, int type);
    77                 void  GetSolutionFromInputs(Vec solution, int analysis_type, int sub_analysis_type);
    7877                int   RiftIsPresent();
    7978                int   MeltingIsPresent();
  • issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

    r3913 r3971  
    1313        /*intermediary: */
    1414        int gsize;
     15        int i;
     16        Element* element=NULL;
    1517
    1618        /*output: */
     
    3032       
    3133        /*Go through elements and plug solution: */
    32         elements->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
    33 
    34         /*Elements drive the update: */
    35         elements->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
     34        for (i=0;i<elements->Size();i++){
     35                element=(Element*)elements->GetObjectByOffset(i);
     36                element->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
     37        }
    3638
    3739        /*Assemble vector: */
Note: See TracChangeset for help on using the changeset viewer.