Changeset 9513

Timestamp:

08/31/11 11:01:17 (14 years ago)

Author:

Mathieu Morlighem

Message:

preprocess pressureload in marshall

Location:

issm/trunk/src

Files:

• c/objects/Loads/Icefront.cpp (modified) (1 diff)
• m/classes/model.m (modified) (1 diff)
• m/model/marshall.m (modified) (1 diff)

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

@@ -89 +89 @@
 
         /*Fill*/
-        switch((int)iomodel->Data(PressureloadEnum)[segment_width*i+segment_width-1]){
-                case 0: icefront_fill=AirEnum; break;
-                case 1: icefront_fill=WaterEnum; break;
-                case 2: icefront_fill=IceEnum; break;
-                default: _error_("Fill %i not supported",iomodel->Data(PressureloadEnum)[segment_width*i+segment_width-1]);
-        }
+        icefront_fill=(int)iomodel->Data(PressureloadEnum)[segment_width*i+segment_width-1];
         
         /*Ok, we have everything to build the object: */

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

@@ -140 +140 @@
                  %Boundary conditions
                  nodeonboundary = modelfield('default',NaN,'marshall',false);
-                 pressureload   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
+                 pressureload   = modelfield('default',NaN,'marshall',true,'preprocess','marshallpressureload','format','DoubleMat','mattype',3);
                  spcvx          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  spcvy          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);

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

@@ -340 +340 @@
 function out=marshallverbose(in)
         out = VerboseToBinary(in);
+function out=marshallpressureload(in)
+        out=in;
+        pos=find(in(:,end)==0); out(pos,end)=AirEnum;
+        pos=find(in(:,end)==1); out(pos,end)=WaterEnum;
+        pos=find(in(:,end)==2); out(pos,end)=IceEnum;