Changeset 9522

Timestamp:

08/31/11 11:43:11 (14 years ago)

Author:

Mathieu Morlighem

Message:

Got rid of riftinfo

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/Loads/Riftfront.cpp (modified) (3 diffs)
• m/classes/model.m (modified) (1 diff)
• m/model/marshall.m (modified) (1 diff)
• m/model/plot/plot_riftfraction.m (modified) (1 diff)
• m/model/presolve.m (modified) (1 diff)

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

@@ -490 +490 @@
         ZEnum,
         Fake36Enum,
-        RiftinfoEnum,
+        RiftsEnum,
         ElementOnIceSheetEnum,
         SpcthicknessEnum,

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

@@ -432 +432 @@
                 case ZEnum : return "Z";
                 case Fake36Enum : return "Fake36";
-                case RiftinfoEnum : return "Riftinfo";
+                case RiftsEnum : return "Rifts";
                 case ElementOnIceSheetEnum : return "ElementOnIceSheet";
                 case SpcthicknessEnum : return "Spcthickness";

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

@@ -173 +173 @@
         /*Create Riffront loads for rifts: */
         if(numrifts){
-                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftinfoEnum);
-                iomodel->FetchData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
+                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsEnum);
+                iomodel->FetchData(5,RiftsEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
                 for(i=0;i<numriftsegments;i++){
                         if(iomodel->my_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){
@@ -181 +181 @@
                         }
                 }
-                iomodel->DeleteData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
+                iomodel->DeleteData(5,RiftsEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
                 xfree((void**)&riftfront);
         }

issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -87 +87 @@
         /*Deal with rifts, they have to be included into one partition only, not several: */
         if(numrifts){
-                iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftinfoEnum);
+                iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsEnum);
                 for(i=0;i<numrifts;i++){
                         el1=(int)*(riftinfo+RIFTINFOSIZE*i+2)-1; //matlab indexing to c indexing

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

@@ -430 +430 @@
         else if (strcmp(name,"Z")==0) return ZEnum;
         else if (strcmp(name,"Fake36")==0) return Fake36Enum;
-        else if (strcmp(name,"Riftinfo")==0) return RiftinfoEnum;
+        else if (strcmp(name,"Rifts")==0) return RiftsEnum;
         else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum;
         else if (strcmp(name,"Spcthickness")==0) return SpcthicknessEnum;

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

@@ -60 +60 @@
 
         /*Ok, retrieve all the data needed to add a penalty between the two nodes: */
-        el1=(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+2);
-        el2=(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+3); 
-
-        node1=(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+0); 
-        node2=(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+1);
+        el1=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+2);
+        el2=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+3); 
+
+        node1=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+0); 
+        node2=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+1);
 
         /*id: */
@@ -89 +89 @@
         this->penalty_lock=penalty_lock;
         this->material_converged=0;
-        this->normal[0]=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+4);
-        this->normal[1]=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+5);
-        this->length=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+6);
-        this->fraction=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+9);
-        this->state=(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+11);
+        this->normal[0]=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+4);
+        this->normal[1]=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+5);
+        this->length=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+6);
+        this->fraction=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+9);
+        this->state=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+11);
 
         //intialize inputs, and add as many inputs per element as requested: 
@@ -99 +99 @@
                 
         riftfront_type=SegmentRiftfrontEnum;
-        riftfront_fill = (int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+7);
-        riftfront_friction=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+8);
-        riftfront_fractionincrement=*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+10);
+        riftfront_fill = (int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+7);
+        riftfront_friction=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+8);
+        riftfront_fractionincrement=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+10);
         riftfront_shelf=(bool)iomodel->Data(NodeOnIceShelfEnum)[node1-1];
 

issm/trunk/src/m/classes/model.m

@@ -77 +77 @@
                  segments             = modelfield('default',NaN,'marshall',false);
                  segmentmarkers       = modelfield('default',NaN,'marshall',false);
-                 rifts                = modelfield('default',NaN,'marshall',false);
-                 riftinfo             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
+                 rifts                = modelfield('default',NaN,'marshall',true,'preprocess','marshallrifts','format','DoubleMat','mattype',3);
                  riftproperties       = modelfield('default',NaN,'marshall',false);
                  numrifts             = modelfield('default',0,'marshall',true,'format','Integer');

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

@@ -345 +345 @@
         pos=find(in(:,end)==1); out(pos,end)=WaterEnum;
         pos=find(in(:,end)==2); out(pos,end)=IceEnum;
+
+function out=marshallrifts(in)
+        if isempty(in) | isnans(in),
+                numrifts=0;
+        else
+                numrifts=numel(in);
+        end
+        numpairs=0;
+        for i=1:numrifts,
+                numpairs=numpairs+size(in(i).penaltypairs,1);
+        end
+
+        out=zeros(numpairs,12); % 2 for nodes + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state.
+
+        count=1;
+        for i=1:numrifts,
+                numpairsforthisrift=size(in(i).penaltypairs,1);
+                out(count:count+numpairsforthisrift-1,1:7)=in(i).penaltypairs;
+                out(count:count+numpairsforthisrift-1,8)=in(i).fill;
+                out(count:count+numpairsforthisrift-1,9)=in(i).friction;
+                out(count:count+numpairsforthisrift-1,10)=in(i).fraction;
+                out(count:count+numpairsforthisrift-1,11)=in(i).fractionincrement;
+                out(count:count+numpairsforthisrift-1,12)=in(i).state;
+                count=count+numpairsforthisrift;
+        end
+

issm/trunk/src/m/model/plot/plot_riftfraction.m

@@ -26 +26 @@
 fractions=zeros(md.numberofnodes,1);
 
-%plug riftproperties fractions:
-fractions(md.riftinfo(:,1))=md.riftproperties;
-fractions(md.riftinfo(:,2))=md.riftproperties;
-
 %complete the tips.
 for i=1:length(md.rifts), 

issm/trunk/src/m/model/presolve.m

@@ -16 +16 @@
 end
 
-numpairs=0;
-for i=1:md.numrifts,
-        numpairs=numpairs+size(md.rifts(i).penaltypairs,1);
-end
-
-md.riftinfo=zeros(numpairs,12); % 2 for nodes + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state.
-
-count=1;
-for i=1:md.numrifts,
-        numpairsforthisrift=size(md.rifts(i).penaltypairs,1);
-        md.riftinfo(count:count+numpairsforthisrift-1,1:7)=md.rifts(i).penaltypairs;
-        md.riftinfo(count:count+numpairsforthisrift-1,8)=md.rifts(i).fill;
-        md.riftinfo(count:count+numpairsforthisrift-1,9)=md.rifts(i).friction;
-        md.riftinfo(count:count+numpairsforthisrift-1,10)=md.rifts(i).fraction;
-        md.riftinfo(count:count+numpairsforthisrift-1,11)=md.rifts(i).fractionincrement;
-        md.riftinfo(count:count+numpairsforthisrift-1,12)=md.rifts(i).state;
-        count=count+numpairsforthisrift;
-end
-
 %Control methods
 md.num_control_type=numel(md.control_type);