Changeset 5242

Timestamp:

08/13/10 11:00:59 (15 years ago)

Author:

Eric.Larour

Message:

New IsScaled routine, simpler interface

Location:

issm/trunk/src/m/qmu/setupdesign

Files:

• IsScaled.m (added)
• QmuSetupDesign.m (modified) (2 diffs)

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

@@ -14 +14 @@
 
 %if descriptor is more generic, like 'Thickness','RhoIce', decide whether it will get expanded.
-switch descriptor,
-case {'RhoIce','RhoWater','HeatCapacity','ThermalConductivity','Gravity'},
+flag=IsScaled(descriptor); %will error out if the descriptor is unknow.
 
+if flag==0,
         dvar(end+1)=variables;
 
-case {'Thickness','Surface','Bed','DragCoefficient'},
+else if flag==1,
 
         if length(variables.stddev)>md.npart,
@@ -36 +36 @@
         end
 
-case {'RiftsFriction'},
-        
-        dvar=setupriftsfriction(md,dvar,variable);
+else if flag==2,
 
-otherwise
-        error(['QmuSetupDesign warning message: could not find ' descriptor ' setup design function']);
+        %special case
+        if strcmpi(descriptor,'RiftsFriction'),
+                dvar=setupriftsfriction(md,dvar,variable);
+        end
 end