Changeset 3875

Timestamp:

05/21/10 11:20:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• Inputs/PentaVertexInput.cpp (modified) (3 diffs)
• Loads/Pengrid.cpp (modified) (1 diff)

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

@@ -4568 +4568 @@
 }
 /*}}}*/
+/*FUNCTION Penta::UpdateInputsFromConstant(bool value, int name);{{{1*/
+void  Penta::UpdateInputsFromConstant(bool constant, int name){
+        /*Nothing updated for now*/
+}
+/*}}}*/
+/*FUNCTION Penta::UpdateInputsFromConstant(double value, int name);{{{1*/
+void  Penta::UpdateInputsFromConstant(double constant, int name){
+        /*Nothing updated for now*/
+}
+/*}}}*/

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

@@ -153 +153 @@
                 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(double constant, int name);
                 void  UpdateInputsFromConstant(int constant, int name);
-                void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
+                void  UpdateInputsFromConstant(bool constant, int name);
                 /*}}}*/
 

issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

@@ -242 +242 @@
         double B[8][27];
         double B_reduced[6][DOFVELOCITY*numgrids];
-        double velocity[3][DOFVELOCITY];
+        double velocity[numgrids][DOFVELOCITY];
 
         /*Get B matrix: */
@@ -287 +287 @@
         double B[8][27];
         double B_reduced[6][DOFVELOCITY*numgrids];
-        double velocity[3][DOFVELOCITY];
+        double velocity[numgrids][DOFVELOCITY];
 
         /*Get B matrix: */
@@ -332 +332 @@
         double B[8][27];
         double B_reduced[6][DOFVELOCITY*numgrids];
-        double velocity[3][DOFVELOCITY];
+        double velocity[numgrids][DOFVELOCITY];
 
         /*Get B matrix: */

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -739 +739 @@
 /*FUNCTION Pengrid::UpdateInputsFromConstant(bool constant, int name) {{{1*/
 void  Pengrid::UpdateInputsFromConstant(bool constant, int name){
-        /*Nothing updated yet*/
+
+        switch(name){
+
+                case ResetPenaltiesEnum:
+                        if (constant) zigzag_counter=0;
+                        return;
+
+        }
 }
 /*}}}*/