Changeset 8011

Timestamp:

04/21/11 11:27:33 (14 years ago)

Author:

seroussi

Message:

greg test

Location:

issm/trunk/test/Miscellaneous

Files:

• Bump/Bump.par (modified) (3 diffs)
• Bump/runme.m (modified) (1 diff)
• GJM_test1 (added)
• GJM_test1/Square.exp (added)
• GJM_test1/SquareFront.exp (added)
• GJM_test1/SquareShelf.par (added)
• GJM_test1/test1.m (added)

issm/trunk/test/Miscellaneous/Bump/Bump.par

@@ -1 @@
-%Start defining model parameters here
-
 %Choose the radius and heigth of the bump:
 height=100;
 
 %dynamics
-md.debug=2;
-md.dt=0.1*md.yts; %1 year
-md.ndt=md.dt*3; 
-md.artificial_diffusivity=1;
-
 hmin=1000;
 hmax=1000;
@@ -17 +10 @@
 md.bed=-md.rho_ice/md.rho_water*md.thickness+10;
 md.surface=md.bed+md.thickness;
-md.bed=-md.rho_ice/md.rho_water*md.thickness+height*exp(-((md.x-50000).^2+(md.y-50000).^2)/(2000)^2)+10;
+md.bed=-md.rho_ice/md.rho_water*md.thickness+height*exp(-((md.x-50000).^2+(md.y-50000).^2)/(4000)^2)+10;
 md.thickness=md.surface-md.bed;
 
@@ -39 +32 @@
 
 %Parallel options
-md.cluster='larsen';
-md.np=8;
-md.time=50;
 md.waitonlock=1;
 md.connectivity=100;
-
-%Control method options
-md.nsteps=15;
-md.fit=[2*ones(10,1);0*ones(5,1)];
-md.optscal=1000*ones(md.nsteps,1);
-md.maxiter=20*ones(md.nsteps,1);
-md.maxcontrolconstraint=500;
-md=solversettomumps(md);

issm/trunk/test/Miscellaneous/Bump/runme.m

@@ -1 @@
-%Test of a bump
-
-loadmodel diagstokes
-mdc=mds;
-
-%initialize model with Stokes model
-md=model;
-md=mesh(md,'DomainOutline.exp',2000);
-md=meshexprefine(md,'ContourBump.exp',500);
+md=mesh(model,'DomainOutline.exp',1000);
 md=geography(md,'','');
 md=parameterize(md,'Bump.par');
-md=extrude(md,8,4);
-md.pressure=zeros(md.numberofgrids,1);
-md.vx=zeros(md.numberofgrids,1);
-md.vy=zeros(md.numberofgrids,1);
-md.vz=zeros(md.numberofgrids,1);
-md=setelementstype(md,'pattyn','all','stokes','all');
+md=setelementstype(md,'macayeal','all');
+md.cluster=astrid;
+md.cluster.np=13;
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
-%Initialize the CM with average value of vx and vy
-md.vx_obs=mdc.results.diagnostic.vx;
-md.vy_obs=mdc.results.diagnostic.vy;
-md.vel_obs=mdc.results.diagnostic.vel;
-
-md.nsteps=5;
-md.fit=2*ones(5,1);
-md.optscal=1000*ones(5,1);
-md.maxiter=20*ones(5,1);
-%compute solution
-md=solve(md,'analysis_type','control');
-
-save step1 md
-md.drag=md.results.control.parameter;
-
-md=solve(md,'analysis_type','control');
-save step2 md
-
-md.drag=md.results.control.parameter;
-md.fit=0*md.fit;
-save step3 md
-
-%save model stokes
-mds=md;
-save modelstokes mds
-error
-
-%now run a control method on macayeal
-md=model;
-md=mesh(md,'DomainOutline.exp',2000);
-md=meshexprefine(md,'ContourBump.exp',500);
-md=geography(md,'','');
-md=parameterize(md,'Bump.par');
-md.pressure=zeros(md.numberofgrids,1);
-md.vx=zeros(md.numberofgrids,1);
-md.vy=zeros(md.numberofgrids,1);
-md.vz=zeros(md.numberofgrids,1);
-md=setelementstype(md,'macayeal','all');
-
-%Initialize the CM with average value of vx and vy
-md.vx_obs=DepthAverage(mdc,mdc.results.diagnostic.vx);
-md.vy_obs=DepthAverage(mdc,mdc.results.diagnostic.vy);
-md.vel_obs=DepthAverage(mdc,mdc.results.diagnostic.vel);
-
-%Compute the CM
-md=solve(md,'analysis_type','control')
-
-%save model macayeal
-mdm=md;
-save modelmacayeal mdm
-
-%now run a control method on pattyn
-md=model;
-md=mesh(md,'DomainOutline.exp',2000);
-md=meshexprefine(md,'ContourBump.exp',500);
-md=geography(md,'','');
-md=parameterize(md,'Bump.par');
-md=extrude(md,8,4);
-md.pressure=zeros(md.numberofgrids,1);
-md.vx=zeros(md.numberofgrids,1);
-md.vy=zeros(md.numberofgrids,1);
-md.vz=zeros(md.numberofgrids,1);
-md=setelementstype(md,'pattyn','all');
-
-%Initialize the CM
-md.vx_obs=mdc.results.diagnostic.vx;
-md.vy_obs=mdc.results.diagnostic.vy;
-md.vel_obs=mdc.results.diagnostic.vel;
-
-%Compute the CM
-md=solve(md,'analysis_type','control')
-
-%save model pattyn
-mdp=md;
-save modelpattyn mdp
+%Fields and tolerances to track changes
+field_names     ={'Vx','Vy','Vel','Pressure'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13};
+field_values={...
+        PatchToVec(md.results.DiagnosticSolution.Vx),...
+        PatchToVec(md.results.DiagnosticSolution.Vy),...
+        PatchToVec(md.results.DiagnosticSolution.Vel),...
+        PatchToVec(md.results.DiagnosticSolution.Pressure),...
+        };