Changeset 3790

Timestamp:

05/17/10 16:51:47 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed EnumIsElement

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• objects/Inputs/BoolInput.cpp (modified) (1 diff)
• objects/Inputs/IntInput.cpp (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp

@@ -8 +8 @@
 /*functions on enums: */
 int EnumIsElement(int en){
-        if ((en>=ElementEnum) && (en<=SingEnum))return 1;
+        if ((en>=ElementEnum) && (en<=TriaEnum)) return 1;
         else return 0;
 }
 
 int EnumIsLoad(int en){
-        if ((en>=LoadEnum) && (en<=NumericalfluxEnum))return 1;
+        if ((en>=LoadEnum) && (en<=SegmentRiftfrontEnum)) return 1;
         else return 0;
 }
 int EnumIsMaterial(int en){
-        if ((en>=MaterialEnum) && (en<=MatparEnum))return 1;
+        if ((en>=MaterialEnum) && (en<=MatparEnum)) return 1;
         else return 0;
 }

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

@@ -132 +132 @@
 /*Object functions*/
 /*FUNCTION BoolInput::GetParameterValue(bool* pvalue) {{{1*/
-void BoolInput::GetParameterValue(bool* pvalue){ISSMERROR(" not supported yet!");}
+void BoolInput::GetParameterValue(bool* pvalue){
+        *pvalue=value;
+}
 /*}}}*/
 /*FUNCTION BoolInput::GetParameterValue(int* pvalue){{{1*/

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

@@ -136 +136 @@
 /*FUNCTION IntInput::GetParameterValue(int* pvalue){{{1*/
 void IntInput::GetParameterValue(int* pvalue){
-        ISSMERROR(" not supported yet!");
+        *pvalue=value;
 }
 /*}}}*/