Changeset 26209

Timestamp:

04/23/21 17:21:56 (5 years ago)

Author:

schlegel

Message:

BUG: isclimatology not transferring correctly to cycle_forcing from SMB in old models

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBcomponents.m (modified) (1 diff)
• SMBforcing.m (modified) (1 diff)
• SMBgemb.m (modified) (1 diff)
• SMBmeltcomponents.m (modified) (1 diff)
• model.m (modified) (1 diff)

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

@@ -12 +12 @@
                 averaging = 0;
                 requested_outputs     = {};
+                isclimatology;
         end
         methods

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

@@ -10 +10 @@
                 requested_outputs = {};
                 averaging         = 0;
+                isclimatology;
         end
         methods

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

@@ -23 +23 @@
                 isturbulentflux;
                 isconstrainsurfaceT;
+                isclimatology;
 
                 %inputs:

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

@@ -13 +13 @@
                 averaging = 0;
                 requested_outputs      = {};
+                isclimatology;
         end
         methods

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

@@ -168 +168 @@
                         %2019 Mar 28, updated 2021 April 23
                         if isa(md.smb,'SMBcomponents') | isa(md.smb,'SMBmeltcomponents') | isa(md.smb,'SMBforcing') | isa(md.smb,'SMBgemb') 
-                                if isa(md.smb.isclimatology,'double')
-                                        if prod(size(md.smb.isclimatology)) ~= 1
-                                                md.smb.isclimatology = 0;
+                                if any(strcmp(fieldnames(md.smb),'isclimatology'))
+                                        if isa(md.smb.isclimatology,'double')
+                                                if prod(size(md.smb.isclimatology)) ~= 1
+                                                        md.smb.isclimatology = 0;
+                                                end
+                                                md.timestepping.cycle_forcing=md.smb.isclimatology;
                                         end
-                                        md.timestepping.cycle_forcing=md.smb.isclimatology;
                                 end
                         end