CHG: added check that isslc should be turned on

Author: MathieuMorlighem

src/m/classes/sealevelmodel.m

@@ -62,50 +62,54 @@ function checkconsistency(slm,solutiontype) % {{{
 				error('earth.solidearth.transfercount should be of size earth.mesh.numberofvertices') 
 			end
 
-			%check that the transition vectors have the right size:
+			%check that slc is on
+			if slm.earth.transient.isslc ==0
+				error('earth.transient.isslc should be turned on') 
+			end
+
 			for i=1:length(slm.icecaps),
-				if slm.icecaps{i}.mesh.numberofvertices ~= length(slm.earth.solidearth.transitions{i}),
-					error(['issue with size of transition vector for ice cap: ' num2str(i) ' name: ' slm.icecaps{i}.miscellaneous.name]);
+
+				md= slm.icecaps{i};
+
+				%check that the transition vectors have the right size:
+				if md.mesh.numberofvertices ~= length(slm.earth.solidearth.transitions{i}),
+					error(['issue with size of transition vector for ice cap: ' num2str(i) ' name: ' md.miscellaneous.name]);
 				end
-			end
-			
-			%check that runfrequency is the same everywhere:
-			for i=1:length(slm.icecaps)
-				if slm.icecaps{i}.solidearth.settings.runfrequency~=slm.earth.solidearth.settings.runfrequency
-					error(['icecap model ' slm.icecaps{i}.miscellaneous.name ' should have the same run frequency as earth!']);
+
+				%check that runfrequency is the same everywhere:
+				if md.solidearth.settings.runfrequency~=slm.earth.solidearth.settings.runfrequency
+					error(['icecap model ' md.miscellaneous.name ' should have the same run frequency as earth!']);
 				end
-			end
 
-			%make sure steric_rate is the same everywhere:
-			for i=1:length(slm.icecaps)
-				md= slm.icecaps{i};
+				%make sure steric_rate is the same everywhere:
 				if ~isempty(find(md.dsl.sea_surface_height_above_geoid - slm.earth.dsl.sea_surface_height_above_geoid(slm.transitions{i})))
 					error(['steric rate on ice cap ' md.miscellaneous.name ' is not the same as for the earth']);
 				end
-			end
 
-			%make sure grd is the same everywhere:
-			for i=1:length(slm.icecaps)
-				md= slm.icecaps{i};
+				%make sure grd is the same everywhere:
 				if md.solidearth.settings.isgrd~=slm.earth.solidearth.settings.isgrd
 					error(['isgrd on ice cap ' md.miscellaneous.name ' is not the same as for the earth']);
 				end
-			end
 
-			%make sure that there is no solid earth external forcing on the basins:
-			for i=1:length(slm.icecaps)
-				md= slm.icecaps{i};
+				%make sure that there is no solid earth external forcing on the basins:
 				if ~isempty(md.solidearth.external)
 					error('cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model');
 				end
-			end
 
-			%make sure that we have the right grd model for computing out sealevel patterns:
-			for i=1:length(slm.icecaps)
-				md= slm.icecaps{i};
+				%make sure that there is no solid earth external forcing on the basins:
+				if ~isempty(md.solidearth.external)
+					error('cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model');
+				end
+
+				%make sure that we have the right grd model for computing out sealevel patterns:
 				if md.solidearth.settings.grdmodel~=0
 					error(['ice sheets do not run GRD module, specify solidearth.settings.grdmodel=0 on ice cap ',num2str(i)]);
 				end
+
+				%make sure sea level change solver is on
+				if md.transient.isslc==0
+					error(['isslc on ice cap ' md.miscellaneous.name ' is not turned off']);
+				end
 			end
 
 		end