Changeset 21148

Timestamp:

08/18/16 10:07:27 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better way to deal with recovering old SMB fields

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBhenning.m (modified) (1 diff)
• model.m (modified) (2 diffs)

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

@@ -13 +13 @@
                         switch nargin
                                 case 0
+                                case 1
+                                        inputstruct=varargin{1};
+                                        list1 = properties('SMBhenning');
+                                        list2 = fieldnames(inputstruct);
+                                        for i=1:length(list1)
+                                                fieldname = list1{i};
+                                                if ismember(fieldname,list2),
+                                                        self.(fieldname) = inputstruct.(fieldname);
+                                                end
+                                        end
                                 otherwise
                                         error('constructor not supported');

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

@@ -1044 +1044 @@
                         end
                         %2014 January 9th
-                        if isfield(structmd,'surfaceforcings'),
+                        if isfield(structmd,'surfaceforcings') & isa(md.smb,'surfaceforcings'),
                                 disp('Recovering old surfaceforcings class');
                                 mass_balance=structmd.surfaceforcings.mass_balance;
@@ -1051 +1051 @@
                         end
                         %2015 September 10
-                        if isfield(structmd,'surfaceforcings') & isa(md.smb,'SMB'),
+                        if isfield(structmd,'surfaceforcings') & isa(structmd.surfaceforcings,'SMB'),
                                 disp('Recovering old SMB class');
                                 md.smb=SMBforcing(structmd.surfaceforcings);
+                        end
+                        if isfield(structmd,'surfaceforcings') & isa(structmd.surfaceforcings,'SMBhenning'),
+                                disp('Recovering old SMBhenning class');
+                                md.smb=SMBhenning(structmd.surfaceforcings);
                         end