Changeset 5197

Timestamp:

08/12/10 12:25:18 (15 years ago)

Author:

Eric.Larour

Message:

Simplified QmuSetupDesign

Location:

issm/trunk/src/m/qmu/setupdesign

Files:

• QmuSetupDesign.m (modified) (1 diff)
• setupbed.m (deleted)
• setupdrag.m (deleted)
• setupdrag_node.m (deleted)
• setupgravity.m (deleted)
• setupheatcapacity.m (deleted)
• setuprhoice.m (deleted)
• setuprhowater.m (deleted)
• setupsurface.m (deleted)
• setupthermalconductivity.m (deleted)
• setupthickness.m (deleted)
• setupthickness_node.m (deleted)

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

@@ -1 +1 @@
 function dvar=QmuSetupDesign(dvar,variables,params,varargin)
+
+%recover model
+for i=1:length(varargin)
+    if strcmp(class(varargin{i}),'model')
+        md=varargin{i};
+        break;
+    end
+end
+
 
 %get descriptor
 descriptor=variables.descriptor;
 
-%loop on descriptor
-if strcmpi(descriptor,'RhoIce')
+%decide whether this is a distributed variable, which will drive whether we expand it into npart values,
+%or if we just carry it forward as is. 
 
-        dvar=setuprhoice(dvar,variables,params,varargin{:});
+switch descriptor,
+case {'RhoIce','RhoWater','HeatCapacity','ThermalConductivity','Gravity'},
 
-elseif strcmpi(descriptor,'RhoWater')
+        dvar(end+1)=variables;
 
-        dvar=setuprhowater(dvar,variables,params,varargin{:});
+case {'Thickness','Surface','Bed','DragCoefficient'},
 
-elseif strcmpi(descriptor,'HeatCapacity')
+        if length(variables.stddev)>md.npart,
+                error('QmuSetupDesign error message: stddev should be either a scalar or a ''npart'' length vector');
+        end
 
-        dvar=setupheatcapacity(dvar,variables,params,varargin{:});
+        %ok, dealing with semi-discrete distributed variable. Distribute according to how many 
+        %partitions we want
 
-elseif strcmpi(descriptor,'ThermalConductivity')
+        for j=1:md.npart
+                dvar(end+1)           =variables;
+                dvar(end  ).descriptor=sprintf('%s%d',variables.descriptor,j);
+                if length(variables.stddev)>1,
+                        dvar(end  ).stddev=variables.stddev(j);
+                end
+        end
 
-        dvar=setupthermalconductivity(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'Gravity')
-
-        dvar=setupgravity(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'Thickness')
-
-        dvar=setupthickness(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'Surface')
-
-        dvar=setupsurface(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'Bed')
-
-        dvar=setupbed(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'DragCoefficient')
-
-        dvar=setupdrag(dvar,variables,params,varargin{:});
-
-elseif strncmpi(descriptor,'DragCoefficientNode',9)
-
-        dvar=setupdrag_node(dvar,variables,params,varargin{:});
-
-elseif strncmpi(descriptor,'ThicknessNode',14)
-
-        dvar=setupthickness_node(dvar,variables,params,varargin{:});
-
-elseif strcmpi(descriptor,'RiftsFriction')
-
+case {'RiftsFriction'},
+        
         dvar=setupriftsfriction(dvar,variables,params,varargin{:});
 
-else
+otherwise
         error(['QmuSetupDesign warning message: could not find ' descriptor ' setup design function']);
 end
-
-end