Changeset 24988 for issm/trunk-jpl/src/m/classes/qmu.m

Timestamp:

06/08/20 22:58:53 (5 years ago)

Author:

Eric.Larour

Message:

CHG: more integration of partition vectors into variables. Slowly stepping
away from the qmu.vpartition vector paradigm, not yet fully though.

File:

• issm/trunk-jpl/src/m/classes/qmu.m (modified) (5 diffs)

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

@@ -18 +18 @@
                 numberofresponses           = 0;
                 variabledescriptors         = {};
+                variablepartitions          = {};
                 responsedescriptors         = {};
                 mass_flux_profile_directory = NaN;
@@ -57 +58 @@
         methods
                 function self = extrude(self,md) % {{{
-                        self.vpartition=project3d(md,'vector',self.vpartition','type','node');
-                        self.epartition=project3d(md,'vector',self.epartition','type','element');
                 end % }}}
                 function self = qmu(varargin) % {{{
@@ -97 +96 @@
                                 end
                         end
-                        if ~isempty(md.qmu.vpartition) & ~any(isnan(md.qmu.vpartition)),
-                                if size(md.qmu.vpartition,1)~=md.mesh.numberofvertices
-                                        md = checkmessage(md,['user supplied vertex partition for qmu analysis should have size md.mesh.numberofvertices x 1']);
-                                end
-                                if min(md.qmu.vpartition)~=0,
-                                        md = checkmessage(md,['vertex partition vector not indexed from 0 on']);
-                                end
-                                if max(md.qmu.vpartition)>=md.qmu.numberofpartitions,
-                                        md = checkmessage(md,['for qmu analysis, vertex partitioning vector cannot go over npart, number of partition areas']);
-                                end
-                        end
-                        if ~isempty(md.qmu.epartition) & ~any(isnan(md.qmu.epartition)),
-                                if size(md.qmu.epartition,1)~=md.mesh.numberofelements,
-                                        md = checkmessage(md,['user supplied element partition for qmu analysis should have size md.mesh.numberofelements x 1']);
-                                end
-                                if min(md.qmu.epartition)~=0,
-                                        md = checkmessage(md,['element partition vector not indexed from 0 on']);
-                                end
-                                if max(md.qmu.epartition)>=md.qmu.numberofpartitions,
-                                        md = checkmessage(md,['for qmu analysis, element partitioning vector cannot go over npart, number of partition areas']);
-                                end
-                        end
-                        if isempty(md.qmu.vpartition) | any(isnan(md.qmu.vpartition)) | isempty(md.qmu.epartition) | any(isnan(md.qmu.epartition)),
-                                md = checkmessage(md,['for qmu analysis, both an element and partitioning vectors need to be supplied with no nan values! One can be defaulted to all zeros.']);
-                        end
 
                         %go through variables and check for consistency: 
@@ -198 +172 @@
                                 end
                         end
-                        fielddisplay(self,'vpartition','user provided mesh partitioning (vertex based)');
-                        fielddisplay(self,'epartition','user provided mesh partitioning (element based)');
-                        fielddisplay(self,'numberofpartitions','number of partitions for semi-discrete qmu')
+                        fielddisplay(self,'variablepartitions','');
                         fielddisplay(self,'variabledescriptors','');
                         fielddisplay(self,'responsedescriptors','');
@@ -223 +195 @@
                         WriteData(fid,prefix,'object',self,'fieldname','numberofresponses','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','variabledescriptors','format','StringArray');
+                        WriteData(fid,prefix,'object',self,'fieldname','variablepartitions','format','MatArray');
                         WriteData(fid,prefix,'object',self,'fieldname','responsedescriptors','format','StringArray');
                         if ~isempty(self.mass_flux_segments),