Changeset 3971

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:

• DataSet/DataSet.cpp (modified) (1 diff)
• DataSet/DataSet.h (modified) (1 diff)
• modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (modified) (2 diffs)

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

@@ -1078 +1078 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::GetSolutionFromInputs{{{1*/
-void  DataSet::GetSolutionFromInputs(Vec solution, int analysis_type, int sub_analysis_type){
-
-        vector<Object*>::iterator object;
-        Element* element=NULL;
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                if(EnumIsElement((*object)->Enum())){
-
-                        element=(Element*)(*object);
-                        element->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
-                }
-                else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!");
-        }
-}
-/*}}}*/
 /*FUNCTION DataSet::UpdateInputsFromConstant{{{1*/
 void  DataSet::UpdateInputsFromConstant(double constant, int name){

issm/trunk/src/c/DataSet/DataSet.h

@@ -75 +75 @@
                 void  UpdateInputsFromVector(int* vector,int name, int type);
                 void  UpdateInputsFromVector(bool* vector,int name, int type);
-                void  GetSolutionFromInputs(Vec solution, int analysis_type, int sub_analysis_type);
                 int   RiftIsPresent();
                 int   MeltingIsPresent();

issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

@@ -13 +13 @@
         /*intermediary: */
         int gsize;
+        int i;
+        Element* element=NULL;
 
         /*output: */
@@ -30 +32 @@
         
         /*Go through elements and plug solution: */
-        elements->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
-
-        /*Elements drive the update: */
-        elements->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
+        for (i=0;i<elements->Size();i++){
+                element=(Element*)elements->GetObjectByOffset(i);
+                element->GetSolutionFromInputs(solution,analysis_type,sub_analysis_type);
+        }
 
         /*Assemble vector: */