Changeset 3852

Timestamp:

05/19/10 14:43:07 (15 years ago)

Author:

Mathieu Morlighem

Message:

3d MacAyeal almost working (extrude missing)

Location:

issm/trunk/src/c

Files:

• DataSet/Inputs.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)

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

@@ -315 +315 @@
         double epsilonvx[3];
         double epsilonvy[3];
+        bool   foundvx=false;
+        bool   foundvy=false;
 
         /*Go through inputs and find data for vxenum: */
         for ( object=objects.begin() ; object < objects.end(); object++ ){
                 vxinput=(Input*)(*object); 
-                if (vxinput->EnumType()==vxenum)break;
+                if (vxinput->EnumType()==vxenum){
+                        foundvx=true;
+                        break;
+                }
         }
         /*Go through inputs and find data for vyenum: */
         for ( object=objects.begin() ; object < objects.end(); object++ ){
                 vyinput=(Input*)(*object); 
-                if (vyinput->EnumType()==vyenum)break;
+                if (vyinput->EnumType()==vyenum){
+                        foundvy=true;
+                        break;
+                }
         }
 
         /*Check that both inputs have been found*/
-        if (!vxinput || !vyinput){
-                ISSMERROR("Could not find input with enum %i or enum %i",vxenum,vyenum);
+        if (!foundvx || !foundvy){
+                ISSMERROR("Could not find input with enum %i (%s) or enum %i (%s)",vxenum,EnumAsString(vxenum),vyenum,EnumAsString(vyenum));
         }
 
@@ -369 +377 @@
         }
 
-        ISSMERROR("STOP");
+        ISSMERROR("STOP, take care of Pattyn + see changes in 2d");
 
 }

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

@@ -130 +130 @@
                 for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx[penta_node_ids[i]-1];
                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
+                this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs));
         }
         if (iomodel->vy) {
                 for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy[penta_node_ids[i]-1];
                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
+                this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs));
         }
         if (iomodel->vz) {
                 for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz[penta_node_ids[i]-1];
                 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
+                this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs));
         }
         if (iomodel->vx_obs) {
@@ -4380 +4383 @@
 }
 /*}}}*/
+/*FUNCTION Penta::UpdateInputsFromConstant(int value, int name);{{{1*/
+void  Penta::UpdateInputsFromConstant(int constant, int name){
+        /*Nothing updated for now*/
+}
+/*}}}*/

issm/trunk/src/c/objects/Elements/Penta.h

@@ -146 +146 @@
                 void  UpdateInputsFromVector(int* vector, int name, int type);
                 void  UpdateInputsFromVector(bool* vector, int name, int type);
-                void    UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
-                void    UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
-                void    UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
-
-
+                void  UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
+                void  UpdateInputsFromConstant(int constant, int name);
+                void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
                 /*}}}*/