Changeset 19642

Timestamp:

10/15/15 12:18:53 (9 years ago)

Author:

schlegel

Message:

CHG: update lonestar time plus SMBforcing conversions

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBforcing.m (modified) (1 diff)
• clusters/lonestar.m (modified) (1 diff)
• model.m (modified) (2 diffs)

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

@@ -19 +19 @@
                         switch nargin
                                 case 0
+
+                                case 1
+                                        inputstruct=varargin{1};
+                                        list1 = properties('SMBforcing');
+                                        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/clusters/lonestar.m

@@ -19 +19 @@
                  executionpath = '';
                  interactive   = 0;
-                 time          = 24*60;
+                 time          = 24*60*60;
          end
          properties (SetAccess=private) 

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

@@ -104 +104 @@
                         if ~isa(md.outputdefinition,'outputdefinition'),
                                 md.outputdefinition=outputdefinition();
-                        end
-                        %2014 January 9th - 2015 Sept 10
-                        if isa(md.smb,'smb'),
-                                disp('Recovering old smb class');
-                                mass_balance=md.smb.mass_balance;
-                                md.smb=SMBforcing();
-                                md.smb.mass_balance=mass_balance;
                         end
                         %2014 March 26th
@@ -1040 +1033 @@
                                 md.stressbalance=stressbalance(structmd.diagnostic);
                         end
+                        %2014 January 9th
+                        if isfield(structmd,'surfaceforcings'),
+                                disp('Recovering old surfaceforcings class');
+                                mass_balance=structmd.surfaceforcings.mass_balance;
+                                md.smb=SMB();
+                                md.smb.mass_balance=mass_balance;
+                        end
+                        %2015 September 10
+                        if isfield(structmd,'surfaceforcings') & isa(md.smb,'SMB'),
+                                disp('Recovering old SMB class');
+                                md.smb=SMBforcing(structmd.surfaceforcings);
+                        end
+
                 end% }}}
                 function md = setdefaultparameters(md) % {{{