Changeset 25758 for issm/trunk-jpl/src/m/classes/model.m

Timestamp:

11/16/20 13:22:37 (4 years ago)

Author:

jdquinn

Message:

CHG: Missing changes from merge from Eric’s branch

File:

• issm/trunk-jpl/src/m/classes/model.m (modified) (9 diffs)

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

@@ -192 +192 @@
         methods
                 function md = model(varargin) % {{{
-                
 
                         switch nargin
                                 case 0
-                                        md=setdefaultparameters(md,'earth');
+                                        md=setdefaultparameters(md);
+                                case 1
+                                        error('model constructor not supported yet');
+
                                 otherwise
-                                        options=pairoptions(varargin{:});
-                                        planet=getfieldvalue(options,'planet','earth');
-                                        md=setdefaultparameters(md,planet);
-                                end
+                                        error('model constructor error message: 0 of 1 argument only in input.');
+                                end
+
                 end
                 %}}}
@@ -424 +425 @@
                                 if isobject(md.outputdefinition.definitions{i})
                                         %get subfields
-                                        solutionsubfields=fieldnames(md.outputdefinition.definitions{i});
+                                        solutionsubfields=fields(md.outputdefinition.definitions{i});
                                         for j=1:length(solutionsubfields),
                                                 field=md.outputdefinition.definitions{i}.(solutionsubfields{j});
@@ -548 +549 @@
 
                         %loop over model fields
-                        model_fields=fieldnames(md1);
+                        model_fields=fields(md1);
                         for i=1:length(model_fields),
                                 %get field
@@ -554 +555 @@
                                 fieldsize=size(field);
                                 if isobject(field), %recursive call
-                                        object_fields=fieldnames(md1.(model_fields{i}));
+                                        object_fields=fields(md1.(model_fields{i}));
                                         for j=1:length(object_fields),
                                                 %get field
@@ -721 +722 @@
                         if isstruct(md1.results),
                                 md2.results=struct();
-                                solutionfields=fieldnames(md1.results);
+                                solutionfields=fields(md1.results);
                                 for i=1:length(solutionfields),
                                         if isstruct(md1.results.(solutionfields{i}))
@@ -728 +729 @@
                                                 for p=1:length(md1.results.(solutionfields{i}))
                                                     current = md1.results.(solutionfields{i})(p);
-                                                    solutionsubfields=fieldnames(current);
+                                                    solutionsubfields=fields(current);
                                                     for j=1:length(solutionsubfields),
                                                         field=md1.results.(solutionfields{i})(p).(solutionsubfields{j});
@@ -757 +758 @@
                                 if isobject(md1.outputdefinition.definitions{i})
                                         %get subfields
-                                        solutionsubfields=fieldnames(md1.outputdefinition.definitions{i});
+                                        solutionsubfields=fields(md1.outputdefinition.definitions{i});
                                         for j=1:length(solutionsubfields),
                                                 field=md1.outputdefinition.definitions{i}.(solutionsubfields{j});
@@ -1287 +1288 @@
                         end
                 end% }}}
-                function md = setdefaultparameters(md,planet) % {{{
+                function md = setdefaultparameters(md) % {{{
 
                         %initialize subclasses
@@ -1299 +1300 @@
                         md.friction         = friction();
                         md.rifts            = rifts();
-                        md.solidearth       = solidearth(planet);
+                        md.solidearth       = solidearth();
                         md.dsl              = dsl();
                         md.timestepping     = timestepping();