Changeset 8726

Timestamp:

06/28/11 00:39:02 (14 years ago)

Author:

Eric.Larour

Message:

New exp rotuines.
Fixed loadmodel to include planet class.

Location:

issm/trunk/src/m/utils

Files:

• Exp/expremovestraightsegments.m (added)
• Exp/expsplit.m (added)
• Exp/readwrite/expread.m (modified) (1 diff)
• Interp/PatchToVec.m (modified) (1 diff)
• Model/loadmodel.m (modified) (2 diffs)
• Planet (added)

issm/trunk/src/m/utils/Exp/readwrite/expread.m ¶

@@ -73 +73 @@
         Struct(count).y=A(2,:)';
 
+        if(Struct(count).nods~=length(Struct(count).x))error(['Profile ' num2str(count) ' reports incorrect length']); end;
+
         %skip last coordinate if whole=0,
    if whole==0, fscanf(fid,'%f %f',[1 2]); end

issm/trunk/src/m/utils/Interp/PatchToVec.m ¶

@@ -5 +5 @@
 %      vec=PatchToVec(Patch)
 
-%if the patch is P0, we need to transform the vector a little bit first
+%if the patch is P0: we have element values, return an element vector
 switch(Patch.interpolation(1)),
         case P0Enum,

issm/trunk/src/m/utils/Model/loadmodel.m ¶

@@ -21 +21 @@
         warning off MATLAB:unknownElementsNowStruc;
         struc=load(path,'-mat');
+
         warning on MATLAB:unknownElementsNowStruc;
 
@@ -31 +32 @@
         
         %now, transform md into a new model
-        if ~strcmpi(class(md),'model'),
+        if ~strcmpi(class(md),'model') & ~strcmpi(class(md),'planet'),
                 md2=structtomodel(model,md);
                 md=md2;