Changeset 5200

Timestamp:

08/12/10 12:37:27 (15 years ago)

Author:

Eric.Larour

Message:

Fixed qmuisdistributed in case string ends up in 0.
Fixed QmuSetupDesign to not distribute variables that have already been expanded.

Location:

issm/trunk/src/m/qmu

Files:

• qmuisdistributed.m (modified) (1 diff)
• setupdesign/QmuSetupDesign.m (modified) (1 diff)

issm/trunk/src/m/qmu/qmuisdistributed.m

@@ -6 +6 @@
 last=string(end);
 
-if ((double(last)<=57) & (double(last)>=49)),
+if ((double(last)<=57) & (double(last)>=48)),
         found=1;
 else

issm/trunk/src/m/qmu/setupdesign/QmuSetupDesign.m

@@ -16 +16 @@
 %or if we just carry it forward as is. 
 
+%if descriptor is something like 'Thickness1','Surface10', etc ... the variable expansion already did the work, skip
+if qmuisdistributed(descriptor),
+        return;
+end
+
+%if descriptor is more generic, like 'Thickness','RhoIce', decide whether it will get expanded.
 switch descriptor,
 case {'RhoIce','RhoWater','HeatCapacity','ThermalConductivity','Gravity'},