Changeset 9385

Timestamp:

08/23/11 11:08:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed crash

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (2 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/enum/NumberOfEdgesEnum.m (added)
• m/model/marshall.m (modified) (2 diffs)
• m/utils/Enum/BuildEnum.m (deleted)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -552 +552 @@
         HydrologyWaterVyEnum,
         SpcDynamicEnum,
+        NumberOfEdgesEnum,
         MaximumNumberOfEnums
 };

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -494 +494 @@
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";
                 case SpcDynamicEnum : return "SpcDynamic";
+                case NumberOfEdgesEnum : return "NumberOfEdges";
                 default : return "unknown";
 

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -21 +21 @@
         int numberofedges;
         int numpenalties;
+        int numberofelements;
 
         /*DataSet*/
@@ -27 +28 @@
         /*Fetch parameters: */
         iomodel->constants->FindParam(&prognostic_DG,PrognosticDGEnum);
+        iomodel->constants->FindParam(&numberofelements,NumberOfElementsEnum);
+        iomodel->constants->FindParam(&numberofedges,NumberOfEdgesEnum);
 
         /*Recover pointer: */

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -492 +492 @@
         else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
         else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
+        else if (strcmp(name,"NumberOfEdges")==0) return NumberOfEdgesEnum;
         else _error_("Enum %s not found",name);
 

issm/trunk/src/m/model/marshall.m

@@ -33 +33 @@
 %Quick fix: add some fields needed by parameters
 WriteData(fid,'numberofvertices',md.numberofnodes,{'Integer'});
+WriteData(fid,'numberofedges',size(md.edges,1),{'Integer'});
 
 %close file
@@ -248 +249 @@
         error(['WriteData error message: data type: ' num2str(data_type) ' not supported yet! (' EnumToString(enum) ')']);
 end
+% }}}
+function enum=BuildEnum(string) % {{{
+%BUILDENUM - build enum out of string
+%
+%   Usage:
+%      enum=BuildEnum(string)
+
+if findstr(string,'icesheet'),
+        indices=findstr(string,'icesheet');
+        for i=1:length(indices),
+                string(indices(i):(indices(i)+7))='IceSheet';
+        end
+end
+
+if findstr(string,'iceshelf'),
+        indices=findstr(string,'iceshelf');
+        for i=1:length(indices),
+                string(indices(i):(indices(i)+7))='IceShelf';
+        end
+end
+
+if strncmpi(string,'elementon',9),
+        string(1:9)='ElementOn';
+        string(10)=upper(string(10));
+end
+
+if strncmpi(string,'nodeon',6),
+        string(1:6)='NodeOn';
+        string(7)=upper(string(7));
+end
+
+if strncmpi(string,'numberof',8),
+        string(1:8)='NumberOf';
+        string(9)=upper(string(9));
+end
+
+if findstr(string,'_'),
+        indices=findstr(string,'_');
+        for i=1:length(indices),
+                string(indices(i)+1)=upper(string(indices(i)+1));
+        end
+        string(indices)=[];
+end
+
+if findstr(string,'2d'),
+        indices=findstr(string,'2d');
+        for i=1:length(indices),
+                string(indices(i)+1)=upper(string(indices(i)+1));
+        end
+end
+
+if findstr(string,'3d'),
+        indices=findstr(string,'3d');
+        for i=1:length(indices),
+                string(indices(i)+1)=upper(string(indices(i)+1));
+        end
+end
+
+%take first letter of string and make it uppercase: 
+string(1)=upper(string(1));
+
+%Get Enum
+enum=eval([string 'Enum']); 
 % }}}
 function code=TypeToCode(data_type) % {{{1