Changeset 9650 for issm/trunk/src/m/model/ismodelselfconsistent.m

Timestamp:

09/07/11 10:22:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added qmu object

File:

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

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

@@ -252 +252 @@
 %}}}
 %QMU {{{1
-if md.dakota_analysis,
-        if md.qmu_params.evaluation_concurrency~=1,
+if md.qmu.isdakota,
+        if md.qmu.params.evaluation_concurrency~=1,
                 message(['model not consistent: concurrency should be set to 1 when running dakota in library mode']);
         end
-        if ~isempty(md.part),
-                if numel(md.part)~=md.numberofnodes,
+        if ~isempty(md.qmu.partition),
+                if numel(md.qmu.partition)~=md.numberofnodes,
                         message(['model not consistent: user supplied partition for qmu analysis should have size md.numberofnodes x 1 ']);
                 end
-                if find(md.part)>=md.numberofnodes,
+                if find(md.qmu.partition)>=md.numberofnodes,
                         message(['model not consistent: user supplied partition should be indexed from 0 (c-convention)']);
                 end
-                if min(md.part)~=0,
+                if min(md.qmu.partition)~=0,
                         message(['model not consistent: partition vector not indexed from 0 on']);
                 end
-                if max(md.part)>=md.numberofnodes,
+                if max(md.qmu.partition)>=md.numberofnodes,
                         message(['model not consistent: partition vector cannot have maximum index larger than number of nodes']);
                 end
-                if ~isempty(find(md.part<0)),
+                if ~isempty(find(md.qmu.partition<0)),
                         message(['model not consistent: partition vector cannot have values less than 0']);
                 end
-                if ~isempty(find(md.part>=md.npart)),
-                        message(['model not consistent: partition vector cannot have values more than md.npart-1']);
-                end
-                if max(md.part)>=md.npart,
+                if ~isempty(find(md.qmu.partition>=md.qmu.numberofpartitions)),
+                        message(['model not consistent: partition vector cannot have values more than md.qmu.numberofpartitions-1']);
+                end
+                if max(md.qmu.partition)>=md.qmu.numberofpartitions,
                         message(['model not consistent: for qmu analysis, partitioning vector cannot go over npart, number of partition areas']);
                 end