Changeset 14618

Timestamp:

04/17/13 08:58:45 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added oldclasses/hydrology.m to recover hydrology objects from previous versions

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologyshreve.m (modified) (1 diff)
• model/model.m (modified) (2 diffs)
• oldclasses/hydrology.m (added)

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

@@ -19 +19 @@
                                 case 0
                                         obj=setdefaultparameters(obj);
+                                case 1
+                                        obj=structtoobj(obj,varargin{1});
                                 otherwise
                                         error('constructor not supported');

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

@@ -73 +73 @@
                         end
 
+                        %2012 June 28th
+                        if numel(md.mesh.edges)>1 & any(isnan(md.mesh.edges))
+                                disp('Update model edges from previous version');
+                                md.mesh.edges(isnan(md.mesh.edges))=-1;
+                        end
                         %2012 August 4th
                         if isa(md.materials,'materials'),
@@ -82 +87 @@
                                 end
                         end
-                        %2012 June 28th
-                        if sum(sum(isnan(md.mesh.edges)))>0
-                                disp('Update model edges from previous version');
-                                md.mesh.edges(isnan(md.mesh.edges))=-1;
-                        end
                         %2013 April 12
                         if numel(md.diagnostic.loadingforce==1)
                                 md.diagnostic.loadingforce=0*ones(md.mesh.numberofvertices,3);
                         end
+                        %2013 April 17
+                        if isa(md.hydrology,'hydrology'),
+                                disp('Recovering old hydrology class');
+                                md.hydrology=hydrologyshreve(md.materials);
+                        end
+
 
                 end% }}}