Changeset 32 for issm/trunk/src/m/solutions/dakota/setupdesign/QmuSetupDesign.m

Timestamp:

04/24/09 10:38:58 (16 years ago)

Author:

Mathieu Morlighem

Message:

initial input from ice1

File:

• issm/trunk/src/m/solutions/dakota/setupdesign/QmuSetupDesign.m (modified) (2 diffs)

issm/trunk/src/m/solutions/dakota/setupdesign/QmuSetupDesign.m

@@ -1 @@
-function dvar=QmuSetupDesign(md,dvar,variables)
+function dvar=QmuSetupDesign(dvar,variables,params,varargin)
 
 %get descriptor
@@ -7 +7 @@
 if strcmpi(descriptor,'rho_ice')
 
-        dvar=setuprhoice(md,dvar,variables);
+        dvar=setuprhoice(dvar,variables,params,varargin{:});
+
+elseif strcmpi(descriptor,'rho_water')
+
+        dvar=setuprhowater(dvar,variables,params,varargin{:});
+
+elseif strcmpi(descriptor,'heat_capacity')
+
+        dvar=setupheatcapacity(dvar,variables,params,varargin{:});
+
+elseif strcmpi(descriptor,'thermal_conductivity')
+
+        dvar=setupthermalconductivity(dvar,variables,params,varargin{:});
+
+elseif strcmpi(descriptor,'gravity')
+
+        dvar=setupgravity(dvar,variables,params,varargin{:});
 
 elseif strcmpi(descriptor,'thickness')
 
-        dvar=setupthickness(md,dvar,variables);
+        dvar=setupthickness(dvar,variables,params,varargin{:});
 
 elseif strcmpi(descriptor,'drag')
 
-        dvar=setupdrag(md,dvar,variables);
+        dvar=setupdrag(dvar,variables,params,varargin{:});
 
 elseif strcmpi(descriptor,'riftsfriction')
 
-        dvar=setupriftsfriction(md,dvar,variables);
+        dvar=setupriftsfriction(dvar,variables,params,varargin{:});
 
 else