Changeset 22244

Timestamp:

11/09/17 16:29:22 (7 years ago)

Author:

Eric.Larour

Message:

CHG: merge reults.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/sealevelmodel.m (modified) (1 diff)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/sealevelmodel.m

@@ -108 +108 @@
                                                         if length(icecaps{1}.results.TransientSolution(j).(champs{k}))==icecaps{1}.mesh.numberofvertices,
                                                                 md.results.TransientSolution(j).(champs{k})=zeros(md.mesh.numberofvertices,1);
-                                                        else
-                                                                continue;
-                                                        end
-                                                elseif strcmpi(class(icecaps{1}.results.TransientSolution(j).(champs{k})),'char'),
-                                                        switch champs{k},
-                                                        case 'IceVolume'
-                                                                error('IceVolume mergeresults not implemented yet!');
-                                                        otherwise continue;
+                                                                for l=1:length(trans),
+                                                                        resultcap=icecaps{l}.results.TransientSolution(j).(champs{k});
+                                                                        md.results.TransientSolution(j).(champs{k})(trans{l})=resultcap;
+                                                                end
+                                                        else 
+                                                                if strcmpi(champs{k},'IceVolume') | strcmpi(champs{k},'IceVolumeAboveFloatation') ,
+                                                                        md.results.TransientSolution(j).(champs{k})=0;
+                                                                        for l=1:length(trans),
+                                                                                resultcap=icecaps{l}.results.TransientSolution(j).(champs{k});
+                                                                                md.results.TransientSolution(j).(champs{k})= md.results.TransientSolution(j).(champs{k})+resultcap;
+                                                                        end
+                                                                elseif strcmpi(champs{k},'time'),
+                                                                        md.results.TransientSolution(j).(champs{k})= icecaps{1}.results.TransientSolution(j).(champs{k});
+                                                                else
+                                                                        continue;
+                                                                end
                                                         end
                                                 else
                                                         continue;
                                                 end
-                                                for l=1:length(trans),
-                                                        resultcap=icecaps{l}.results.TransientSolution(j).(champs{k});
-                                                        md.results.TransientSolution(j).(champs{k})(trans{l})=resultcap;
-                                                end
-                                        end
+                                                                                        end
                                 end
                                 self.mergedcaps{2*(i-1)+1}=md;