Changeset 20131

Timestamp:

02/11/16 19:35:45 (9 years ago)

Author:

Eric.Larour

Message:

CHG: no patch globe in the constructor (should be done downstream). Also added consistency checks.

File:

• issm/trunk-jpl/src/m/classes/sealevelmodel.m (modified) (2 diffs)

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

@@ -36 +36 @@
                                 %recover the earth model:
                                 slm.earth = getfieldvalue(options,'earth');
-
-                                %start plugging the ice caps into the earth model: 
-                                earth=slm.earth;
-                                for i=1:length(slm.icecaps),
-                                        icecap=slm.icecaps{i};
-                                        icecap.mesh.segments=alignsegments(icecap.mesh.segments);
-
-                                        %call patch routine:
-                                        if icecap.mesh.epsg==3413, hem=1; else hem=-1; end
-                                        earth.mesh=patchglobe(earth.mesh,icecap.mesh,'hem',hem,'bandwidth',bandwidths{i},'plot',1);
-                                end
-
-                                
-                                %build transition matrices: 
-                                %disp('sealevelmodel: building  icecap transition tables');
-                                %[C,ia,ib]=intersect([slm.earth.mesh.lat slm.earth.mesh.long],[slm.icecaps{i}.mesh.lat slm.icecaps{i}.mesh.long],'rows');
-
-                                
                         end
                 end
@@ -68 +50 @@
                         if slm.earth.transient.iscoupler==0,
                                 error('sealevelmodel checkconsistenty error:  earth model should have the transient coupler option turned on!');
+                        end
+
+                        %check that the transition vectors have the right size: 
+                        for i=1:length(slm.icecaps),
+                                if slm.icecaps{i}.mesh.numberofvertices ~= length(slm.earth.slr.transitions{i}),
+                                        error('sealevelmodel checkconsistenty issue with size of transition vectors!');
+                                end
                         end