Changeset 4850 for issm/trunk/test/Validation/ControlMethods/runmedrag.m

Timestamp:

07/28/10 16:55:17 (15 years ago)

Author:

seroussi

Message:

updated Validation/ControlMethods for today's fields

File:

• issm/trunk/test/Validation/ControlMethods/runmedrag.m (modified) (5 diffs)

issm/trunk/test/Validation/ControlMethods/runmedrag.m

@@ -1 @@
-step=[2];
+step=[1 2];
 division=2;
 density=70000;
@@ -23 +23 @@
         for i=1:division
                 for j=1:division
-                        md.drag(find(md.x>=(minx+(i-1)*Lx/division) & md.x<=(minx+i*Lx/division) & md.y>=(miny+(j-1)*Ly/division) & md.y<=(miny+j*Ly/division)))=drag(count);
+                        md.drag_coefficient(find(md.x>=(minx+(i-1)*Lx/division) & md.x<=(minx+i*Lx/division) & md.y>=(miny+(j-1)*Ly/division) & md.y<=(miny+j*Ly/division)))=drag(count);
                         count=count+1;
                 end
@@ -29 +29 @@
 
         %diagnostic with this drag
-        md=solve(md,'analysis_type','diagnostic');
-        %md.cluster='wilkes'; md=solve(md,'analysis_type','diagnostic_horiz');
+        md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
         %save observed velocities and exact B
-        vx_obs=md.vx; vy_obs=md.vy; vel_obs=md.vel;
-        drag=md.drag;
-        save ObservedVelocities vx_obs vy_obs vel_obs
+        vx_obs=zeros(md.numberofgrids,1);
+        vx_obs(md.results.DiagnosticSolution.Vx.index)=md.results.DiagnosticSolution.Vx.value;
+        vy_obs=zeros(md.numberofgrids,1);
+        vy_obs(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value;
+        drag=md.drag_coefficient;
+        save ObservedVelocities vx_obs vy_obs
         save Exactdrag drag
         clear md
@@ -53 +55 @@
         %plug computed velocities
         load ObservedVelocities
-        md.vx_obs=vx_obs; md.vy_obs=vy_obs; md.vel_obs=vel_obs;
+        md.vx_obs=vx_obs; md.vy_obs=vy_obs;
 
         %control method
         md.nsteps=10;
-        md.control_type='drag';
-        md.mincontrolconstraint=0;
-        md.maxcontrolconstraint=100;
+        md.control_type='drag_coefficient';
+        md.cm_min=0;
+        md.cm_max=100;
+        md.cm_jump=0.99*ones(md.nsteps,1);
         md.plot=1;
-        md.debug=0;
+        md.verbose=0;
+        md.weights=1*ones(md.numberofgrids,1);
         md.optscal=180*ones(md.nsteps,1);
         md.fit=2*ones(md.nsteps,1);
@@ -69 +73 @@
 
 %md.cluster='wilkes';
-%md=solve(md,'analysis_type','control');
-md=solve(md,'analysis_type','control');
-%md=solve(md,'analysis_type','control','package','macayeal');
+md.control_analysis=1;
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 end