Changeset 24988 for issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.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/qmu/setupdesign/QmuSetupVariables.m (modified) (2 diffs)

issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.m

@@ -9 +9 @@
 %ok, key off according to type of descriptor:
 if strncmp(descriptor,'scaled_',7),
-        %we have a scaled variable, expand it over the partition.
+        %we have a scaled variable, expand it over the partition. First recover the partition: 
+        partition=variables.partition;
+        %figure out number of partitions: 
+        npart=qmupart2npart(partition)
 
         if isa(variables,'uniform_uncertain'),
-                if (length(variables.lower)>md.qmu.numberofpartitions || length(variables.upper)>md.qmu.numberofpartitions)
-                        error('QmuSetupDesign error message: stddev should be either a scalar or a ''npart'' length vector');
+                nlower=length(variables.lower); nupper=length(variables.upper);
+                if (nlower ~= npart || nupper ~=npart),
+                        error('QmuSetupVariables error message: upper and lower fields should be same size as the number of partitions');
                 end
         elseif isa(variables,'normal_uncertain'),
-                if length(variables.stddev)>md.qmu.numberofpartitions,
-                        error('QmuSetupDesign error message: stddev should be either a scalar or a ''npart'' length vector');
+                nstddev=length(variables.stddev);
+                nmean=length(variables.mean);
+                if (nstddev ~= npart || nmean ~=npart),
+                        error('QmuSetupVariables error message: stddev and mean fields should be same size as the number of partitions');
                 end
         end
@@ -23 +29 @@
         %ok, dealing with semi-discrete distributed variable. Distribute according to how many 
         %partitions we want
-        for j=1:md.qmu.numberofpartitions
+        for j=1:npart,
                 dvar(end+1)           =variables;
                 dvar(end  ).descriptor=sprintf('%s_%d',variables.descriptor,j);
                 if isa(variables,'uniform_uncertain'),
-                        if length(variables.lower)>1,
-                                dvar(end  ).lower=variables.lower(j);
-                        end
-                        if length(variables.upper)>1,
-                                dvar(end  ).upper=variables.upper(j);
-                        end
+                        dvar(end  ).lower=variables.lower(j);
+                        dvar(end  ).upper=variables.upper(j);
                 elseif isa(variables,'normal_uncertain'),
-                        if length(variables.stddev)>1,
-                                dvar(end  ).stddev=variables.stddev(j);
-                        end
-                        if length(variables.mean)>1,
-                                dvar(end  ).mean=variables.mean(j);
-                        end
-
+                        dvar(end  ).stddev=variables.stddev(j);
+                        dvar(end  ).mean=variables.mean(j);
                 end
         end