Changeset 3673 for issm/trunk/src/c/DataSet/DataSet.cpp

Timestamp:

05/08/10 14:37:25 (15 years ago)

Author:

Eric.Larour

Message:

Redid Params and Inputs

File:

• issm/trunk/src/c/DataSet/DataSet.cpp (modified) (4 diffs)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -207 +207 @@
                         dataset->AddObject(vertex);
                 }
-                else if(enum_type==ParamEnum){
-                        Param* param=NULL;
-                        param=new Param();
-                        param->Demarshall(&marshalled_dataset);
-                        dataset->AddObject(param);
-                }
-                else if(enum_type==NumparEnum){
-                        Numpar* numpar=NULL;
-                        numpar=new Numpar();
-                        numpar->Demarshall(&marshalled_dataset);
-                        dataset->AddObject(numpar);
+                else if(enum_type==DoubleParamEnum){
+                        DoubleParam* doubleparam=NULL;
+                        doubleparam=new DoubleParam();
+                        doubleparam->Demarshall(&marshalled_dataset);
+                        dataset->AddObject(doubleparam);
                 }
                 else if(enum_type==TriaEnum){
@@ -512 +506 @@
 
                 /*Which id does it have: */
-                id=(*object)->GetId();
+                id=(*object)->Id();
 
                 /*Plug rank into ranks, according to id: */
@@ -532 +526 @@
                 for(i=0;i<objects.size();i++){
                         id_offsets[i]=i;
-                        sorted_ids[i]=objects[i]->GetId();
+                        sorted_ids[i]=objects[i]->Id();
                 }
         }
@@ -1364 +1358 @@
                         element->UpdateInputs(solution,analysis_type,sub_analysis_type);
                 }
-                else ISSMERROR("%s%i%s"," object with id: ",(*object)->GetId()," is not an element, in a function that deals only with elements!");
+                else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!");
+        }
+}
+/*}}}*/
+/*FUNCTION DataSet::AddInput{{{1*/
+void  DataSet::AddInput(double value, int enum_type){
+
+        vector<Object*>::iterator object;
+        Element* element=NULL;
+
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                if(EnumIsElement((*object)->Enum())){
+
+                        element=(Element*)(*object);
+                        element->AddInput(value,enum_type);
+                }
+                else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!");
         }
 }