Changeset 3207

Timestamp:

Mar 5, 2010, 4:55:00 PM (17 years ago)

Author:

Mathieu Morlighem

Message:

new weights

Location:

issm/trunk/src/m/classes/public

Files:

• parametercontrolB.m (modified) (1 diff)
• parametercontroldrag.m (modified) (1 diff)
• parametercontroloptimization.m (modified) (1 diff)

issm/trunk/src/m/classes/public/parametercontrolB.m

@@ -23 +23 @@
 %control type
 md.control_type='B';
+
+%weights
+weights=getfieldvalue(options,'weights',ones(md.numberofgrids,1));
+if (length(weights)~=md.numberofgrids)
+        md.weights=ones(md.numberofgrids,1);
+else
+        md.weights=weights;
+end
 
 %nsteps

issm/trunk/src/m/classes/public/parametercontroldrag.m

@@ -23 +23 @@
 %control type
 md.control_type='drag';
+
+%weights
+weights=getfieldvalue(options,'weights',ones(md.numberofgrids,1));
+if (length(weights)~=md.numberofgrids)
+        md.weights=ones(md.numberofgrids,1);
+else
+        md.weights=weights;
+end
 
 %nsteps

issm/trunk/src/m/classes/public/parametercontroloptimization.m

@@ -37 +37 @@
 md2.cm_jump=0.99*ones(md2.nsteps,1);
 md2.control_analysis=1;
+md2.weights=ones(md2.numberofgrids,1);
 
 %loop over the set of parameters