Changeset 8676

Timestamp:

06/20/11 13:43:02 (14 years ago)

Author:

schlegel

Message:

Add check for duplicate timesteps

File:

• issm/trunk/src/m/model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/model/ismodelselfconsistent.m ¶

@@ -303 +303 @@
         %Check that forcing columns are properly ordered
         for i=1:length(forcingnames),
-                if md.forcings.(forcingnames{i})(end,:)~=sort(md.forcings.(forcingnames{i})(end,:)),
+                if any(md.forcings.(forcingnames{i})(end,:)~=sort(md.forcings.(forcingnames{i})(end,:))),
                         message(['model not consistent: model ' md.name ' forcings.' forcingnames{i} ' columns should be chronological']);
                 end
-        end
-
+                if any(md.forcings.(forcingnames{i})(end,1:end-1)==md.forcings.(forcingnames{i})(end,2:end)),
+                        message(['model not consistent: model ' md.name ' forcings.' forcingnames{i} ' columns must not contain duplicate timesteps']);
+                end
+        end
 end
 %}}}