Changeset 26640 for issm/trunk-jpl/src/m/classes/stochasticforcing.m

Timestamp:

11/18/21 06:34:31 (3 years ago)

Author:

vverjans

Message:

CHG: added stochasticforcing capability for basalforcings.floatingice_melting_rate, corrections in stochasticforcing checkconsistency

File:

• issm/trunk-jpl/src/m/classes/stochasticforcing.m (modified) (3 diffs)

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

@@ -45 +45 @@
                         %Check that all fields agree with the corresponding md class and if any field needs the default params   
          checkdefaults = false; %need to check defaults only if one of the field does not have its own dimensionality
+                        structstoch   = structstochforcing();
                         for field=self.fields
             %Checking agreement of classes
             if(contains(field,'SMB'))
-               if~(isequal(class(md.smb),char(field)))
+                                        mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
+                                        if~(isequal(class(md.smb),char(mdname)))
                   error('md.smb does not agree with stochasticforcing field %s', char(field));
                end
             end
-            if(contains(field,'frontalforcings'))
-               if~(isequal(class(md.frontalforcings),char(field)))
+            if(contains(field,'FrontalForcings'))
+                                        mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
+               if~(isequal(class(md.frontalforcings),char(mdname)))
                   error('md.frontalforcings does not agree with stochasticforcing field %s', char(field));
+               end
+            end
+                                if(contains(field,'Calving'))
+                                        mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
+               if~(isequal(class(md.calving),char(mdname)))
+                  error('md.calving does not agree with stochasticforcing field %s', char(field));
+               end
+            end
+                                if(contains(field,'BasalforcingsFloatingice'))
+                                        mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
+               if~(isequal(class(md.basalforcings),char(mdname)))
+                  error('md.basalforcings does not agree with stochasticforcing field %s', char(field));
                end
             end
@@ -129 +144 @@
 
                                 %Scaling covariance matrix (scale column-by-column and row-by-row)
-                                scaledfields = {'DefaultCalving','SMBautoregression'}; %list of fields that need scaling *1/yts
+                                scaledfields = {'DefaultCalving','FloatingMeltRate','SMBautoregression'}; %list of fields that need scaling *1/yts
                                 tempcovariance = self.covariance; %copy of covariance to avoid writing back in member variable
                                 for i=1:num_fields
@@ -161 +176 @@
    % by the class md.stochasticforcing
 
-   list = {...
+   list = structstochforcing(); 
+        list = list.fields;
+end % }}}
+function structure = structstochforcing() % {{{
+        % Defines structure with list of fields
+        % supported and corresponding md names
+        structure.fields = {...
       'DefaultCalving',...
-                'FrontalForcingsRignotAutoregression',...
+      'FloatingMeltRate',...
+      'FrontalForcingsRignotAutoregression',...
       'SMBautoregression'
       };
+        structure.mdnames = {...
+                'calving',...
+                'basalforcings',...
+                'frontalforcingsrignotautoregression',...
+                'SMBautoregression'
+        };
 end % }}}
+
+
+
+