Changeset 4050 for issm/trunk/src/c/objects/Elements/Sing.cpp

Timestamp:

06/17/10 11:06:40 (15 years ago)

Author:

Eric.Larour

Message:

Split results between element results and external results.
element results are held in the Results* dataset of each element.
external results are held in the femmodel->Results* dataset, and hold anything that cannot fit in the elements.

File:

• issm/trunk/src/c/objects/Elements/Sing.cpp (modified) (4 diffs)

issm/trunk/src/c/objects/Elements/Sing.cpp

@@ -708 +708 @@
 }
 /*}}}*/
-/*FUNCTION Sing::AXPY(int YEnum, double scalar, int XEnum);{{{1*/
-void  Sing::AXPY(int YEnum, double scalar, int XEnum){
+/*FUNCTION Sing::AXPYInput(int YEnum, double scalar, int XEnum);{{{1*/
+void  Sing::AXPYInput(int YEnum, double scalar, int XEnum){
 
         Input* xinput=NULL;
@@ -726 +726 @@
 }
 /*}}}*/
-/*FUNCTION Sing::ControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
-void  Sing::ControlConstrain(int control_type, double cm_min, double cm_max){
+/*FUNCTION Sing::ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/
+void  Sing::ControlConstrainInput(int control_type, double cm_min, double cm_max){
 
         Input* input=NULL;
@@ -745 +745 @@
 void  Sing::GetVectorFromInputs(Vec vector,int NameEnum){
 
+        int i;
         const int numvertices=1;
         int doflist1[numvertices];
@@ -751 +752 @@
         for(i=0;i<this->inputs->Size();i++){
                 Input* input=(Input*)this->inputs->GetObjectByOffset(i);
-                if(input->EnumType==NameEnum){
+                if(input->EnumType()==NameEnum){
                         /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
                         this->GetDofList1(&doflist1[0]);