Changeset 14230

Timestamp:

01/10/13 08:48:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed extractions of results that are not structures

File:

• issm/trunk-jpl/src/m/classes/model/model.m (modified) (1 diff)

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

@@ -502 +502 @@
                                 solutionfields=fields(md1.results);
                                 for i=1:length(solutionfields),
-                                        %get subfields
-                                        solutionsubfields=fields(md1.results.(solutionfields{i}));
-                                        for j=1:length(solutionsubfields),
-                                                field=md1.results.(solutionfields{i}).(solutionsubfields{j});
+                                        if isstruct(md1.results.(solutionfields{i}))
+                                                %get subfields
+                                                solutionsubfields=fields(md1.results.(solutionfields{i}));
+                                                for j=1:length(solutionsubfields),
+                                                        field=md1.results.(solutionfields{i}).(solutionsubfields{j});
+                                                        if length(field)==numberofvertices1,
+                                                                md2.results.(solutionfields{i}).(solutionsubfields{j})=field(pos_node);
+                                                        elseif length(field)==numberofelements1,
+                                                                md2.results.(solutionfields{i}).(solutionsubfields{j})=field(pos_elem);
+                                                        else
+                                                                md2.results.(solutionfields{i}).(solutionsubfields{j})=field;
+                                                        end
+                                                end
+                                        else
+                                                field=md1.results.(solutionfields{i});
                                                 if length(field)==numberofvertices1,
-                                                        md2.results.(solutionfields{i}).(solutionsubfields{j})=field(pos_node);
+                                                        md2.results.(solutionfields{i})=field(pos_node);
                                                 elseif length(field)==numberofelements1,
-                                                        md2.results.(solutionfields{i}).(solutionsubfields{j})=field(pos_elem);
+                                                        md2.results.(solutionfields{i})=field(pos_elem);
                                                 else
-                                                        md2.results.(solutionfields{i}).(solutionsubfields{j})=field;
+                                                        md2.results.(solutionfields{i})=field;
                                                 end
                                         end