Changeset 4850

Timestamp:

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

Author:

seroussi

Message:

updated Validation/ControlMethods for today's fields

Location:

issm/trunk/test/Validation/ControlMethods

Files:

• Square.par (modified) (1 diff)
• Squaredrag.par (added)
• runmeB.m (modified) (4 diffs)
• runmedrag.m (modified) (5 diffs)

issm/trunk/test/Validation/ControlMethods/Square.par

@@ -34 +34 @@
 %Deal with boundary conditions:
 md=SetIceShelfBC(md,'Front.exp');
-md.dirichletvalues_diag(:,2)=500;
+md.spcvelocity(:,5)=500;
 
 %Parallel options

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

@@ -24 +24 @@
                 for j=1:division
                         md.observed_temperature(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)))=temperature(count);
-                        md.B=paterson(md.observed_temperature);
+                        md.rheology_B=paterson(md.observed_temperature);
                         count=count+1;
                 end
@@ -31 +31 @@
         %diagnostic with this B
         md.cluster='wilkes'; 
-        md=solve(md,'analysis_type','diagnostic');
+        md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
         %save observed velocities and exact B
-        vx_obs=md.vx; vy_obs=md.vy; vel_obs=md.vel;
-        B=md.B;
-        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;
+        B=md.rheology_B;
+        save ObservedVelocities vx_obs vy_obs
         save ExactB B
         clear md
@@ -54 +57 @@
         %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=5;
-        md.control_type='B';
-        md.mincontrolconstraint=10^7;
-        md.maxcontrolconstraint=1.2*10^9;
+        md.control_type='rheology_B';
+        md.cm_min=10^7;
+        md.cm_max=1.2*10^9;
+        md.cm_jump=0.99*ones(md.nsteps,1);
         md.plot=1;
-        md.debug=0;
-        md.optscal=10^8*ones(md.nsteps,1); md.optscal(1)=2*10^8;
+        md.verbose=0;
+        md.optscal=2*10^8*ones(md.nsteps,1); md.optscal(1)=5*10^8;
         md.fit=0*ones(md.nsteps,1);
+        md.weights=1*ones(md.numberofgrids,1);
         md.maxiter=10*ones(md.nsteps,1);
         md.eps_rel=0.0001;
@@ -71 +76 @@
 
         md.np=8;
-        %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

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