Changeset 9742

Timestamp:

09/09/11 16:22:05 (14 years ago)

Author:

seroussi

Message:

trying to fix dakota

Location:

issm/trunk/src/m/qmu

Files:

• importancefactors.m (modified) (1 diff)
• process_qmu_response_data.m (modified) (1 diff)
• setupdesign/IsScaled.m (modified) (1 diff)

issm/trunk/src/m/qmu/importancefactors.m

@@ -53 +53 @@
 %if numel(factors)==md.mesh.numberofvertices,
 %       %get areas for each vertex.
-%       aire=GetAreas(md.mesh.elements,md.x,md.y);
+%       aire=GetAreas(md.mesh.elements,md.mesh.x,md.mesh.y);
 %       num_elements_by_node=md.nodeconnectivity(:,end);
 %       grid_aire=zeros(md.mesh.numberofvertices,1);

issm/trunk/src/m/qmu/process_qmu_response_data.m

@@ -47 +47 @@
 
         for i=1:num_mass_flux,
-                md.qmu.mass_flux_segments{i}=MeshProfileIntersection(md.mesh.elements,md.x,md.y,[md.qmu.mass_flux_profile_directory '/' md.qmu.mass_flux_profiles{i}]);
+                md.qmu.mass_flux_segments{i}=MeshProfileIntersection(md.mesh.elements,md.mesh.x,md.mesh.y,[md.qmu.mass_flux_profile_directory '/' md.qmu.mass_flux_profiles{i}]);
         end
 

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

@@ -3 +3 @@
 
 switch variablename,
-case {'RhoIce','RhoWater','HeatCapacity','ThermalConductivity','Gravity','MaxVel'},
+case {'MaterialsRhoIce','MaterialsRhoWater','MaterialsHeatCapacity','MaterialsThermalConductivity','Gravity','MaxVel'},
 
         status=0;
 
-case {'Thickness','Surface','Bed','DragCoefficient','RheologyB','RheologyBbar'},
+case {'GeometryThickness','GeometrySurface','GeometryBed','FrictionCoefficient','MaterialsRheologyB','MaterialsRheologyBbar'},
 
         status=1;