Changeset 1632

Timestamp:

08/11/09 07:31:55 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed Enum problem

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• objects/Tria.cpp (modified) (2 diffs)

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

@@ -70 +70 @@
 int NodeEnum(void){                     return          420; }
 /*Loads: */
-int LoadEnum(void){                     return         200; }
-int IcefrontEnum(void){                 return         201; }
-int RiftfrontEnum(void){                return         202; }
-int PenpairEnum(void){                  return         203; }
-int PengridEnum(void){                  return         204; }
-
+int LoadEnum(void){                     return          430; }
+int IcefrontEnum(void){                 return          431; }
+int RiftfrontEnum(void){                return          432; }
+int PenpairEnum(void){                  return          433; }
+int PengridEnum(void){                  return          434; }
 /*Materials: */
 int MaterialEnum(void){                 return          440; }

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -137 +137 @@
                 }
                 else{
-                        throw ErrorException(__FUNCT__," element type not supported yet");
+                        throw ErrorException(__FUNCT__,exprintf(" element type %i not supported yet",(int)*(model->elements_type+2*element+0)));
                 }
 

issm/trunk/src/c/objects/Tria.cpp

@@ -317 +317 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__ "Tria::reateKMatrix"
+#define __FUNCT__ "Tria::CreateKMatrix"
 
 void  Tria::CreateKMatrix(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type){
@@ -545 +545 @@
         }
 
-
         #ifdef _DEBUGELEMENTS_
         if(my_rank==RANK && id==ELID){