Changeset 3120

Timestamp:

02/24/10 13:21:10 (15 years ago)

Author:

Eric.Larour

Message:

Added different error margins capability for different partitions

Location:

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

Files:

• setupdrag.m (modified) (2 diffs)
• setupthickness.m (modified) (2 diffs)

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

@@ -8 +8 @@
 end
 
+%capture stddev:
+stddev=variables.stddev;
+
+if length(stddev)>md.npart,
+        error('setupdrag error message: stddev should be either a scalar or a ''npart'' length vector');
+end
+
 %ok, dealing with semi-discrete distributed variable. Distribute according to how many 
 %partitions we want
@@ -14 +21 @@
         dvar(end+1)           =variables;
         dvar(end  ).descriptor=sprintf('%s%d',variables.descriptor,j);
+        if length(stddev)>1,
+                dvar(end  ).stddev=stddev(j);
+        end
 end
 

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

@@ -7 +7 @@
     end
 end
+%capture stddev:
+stddev=variables.stddev;
+
+if length(stddev)>md.npart,
+        error('setupthickness error message: stddev should be either a scalar or a ''npart'' length vector');
+end
 
 %ok, dealing with semi-discrete distributed variable. Distribute according to how many 
@@ -14 +20 @@
         dvar(end+1)           =variables;
         dvar(end  ).descriptor=sprintf('%s%d',variables.descriptor,j);
+        if length(stddev)>1,
+                dvar(end  ).stddev=stddev(j);
+        end
 end
-
+        
 end