Changeset 13347

Timestamp:

09/12/12 17:08:28 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: enable to load old model with rheology_Z (matdamageice)

Location:

issm/trunk-jpl/src/m/classes

Files:

• matdamageice.m (modified) (1 diff)
• model/model.m (modified) (1 diff)
• oldclasses/materials.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/matdamageice.m

@@ -27 +27 @@
                                 case 0
                                         obj=setdefaultparameters(obj);
+                                case 1
+                                        inputstruct=varargin{1};
+                                        list1 = properties('matdamageice');
+                                        list2 = fieldnames(inputstruct);
+                                        for i=1:length(list1)
+                                                fieldname = list1{i};
+                                                if ismember(fieldname,list2),
+                                                        obj.(fieldname) = inputstruct.(fieldname);
+                                                end
+                                        end
                                 otherwise
                                         error('constructor not supported');

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

@@ -74 +74 @@
 
                          %2012 August 4th
-                         if isa(md.materials,'matice'),
-                                 disp('Recovering old matice');
-                                 md.materials=matice(md.materials);
-                         end
-
-                         if isa(md.materials,'matdamageice'),
-                                 disp('Recovering old matdamageice');
-                                 md.materials=matdamageice(md.materials);
+                         if isa(md.materials,'materials'),
+                                 disp('Recovering old materials');
+                                 if numel(md.materials.rheology_Z)==1 & isnan(md.materials.rheology_Z),
+                                         md.materials=matice(md.materials);
+                                 else
+                                         md.materials=matdamageice(md.materials);
+                                 end
                          end
 

issm/trunk-jpl/src/m/classes/oldclasses/materials.m

@@ -16 +16 @@
                 rheology_B   = NaN;
                 rheology_n   = NaN;
+                rheology_Z   = NaN;
                 rheology_law = '';
         end